diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 07b439b..f8fd6a9 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
@@ -167,6 +168,7 @@
   name: string
   organizeName: string
   id: string
+  deptId: string
 }
 // 实验室ref
 const laboratorydialog = ref()
@@ -199,6 +201,13 @@
 const personClick = () => {
   personListdialog.value.initDialog()
 }
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
   formInline.value.standardOwner = data.id
@@ -206,7 +215,7 @@
 }
 // 选择完科室的回调函数
 const laboratoryListAdd = (data: rowReturn) => {
-  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratory = data.deptId
   formInline.value.standardLaboratoryName = data.organizeName
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
@@ -227,6 +236,7 @@
   <app-container>
     <div class="info-content">
       <el-form
+        id="form"
         ref="ruleFormRef"
         :model="formInline"
         label-position="right"
@@ -587,46 +597,39 @@
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
-                type="datetime"
+                v-model="simulateObject.data"
+                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
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
-                size="default"
-                style="width: 100%;"
+              <el-input
+                v-model.trim="simulateObject.certificateNo"
                 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="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                v-model="simulateObject.authorityOfDate"
+                type="date"
                 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>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 07b439b..f8fd6a9 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
@@ -167,6 +168,7 @@
   name: string
   organizeName: string
   id: string
+  deptId: string
 }
 // 实验室ref
 const laboratorydialog = ref()
@@ -199,6 +201,13 @@
 const personClick = () => {
   personListdialog.value.initDialog()
 }
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
   formInline.value.standardOwner = data.id
@@ -206,7 +215,7 @@
 }
 // 选择完科室的回调函数
 const laboratoryListAdd = (data: rowReturn) => {
-  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratory = data.deptId
   formInline.value.standardLaboratoryName = data.organizeName
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
@@ -227,6 +236,7 @@
   <app-container>
     <div class="info-content">
       <el-form
+        id="form"
         ref="ruleFormRef"
         :model="formInline"
         label-position="right"
@@ -587,46 +597,39 @@
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
-                type="datetime"
+                v-model="simulateObject.data"
+                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
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
-                size="default"
-                style="width: 100%;"
+              <el-input
+                v-model.trim="simulateObject.certificateNo"
                 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="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                v-model="simulateObject.authorityOfDate"
+                type="date"
                 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>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6453565..6bda8e3 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -29,22 +29,11 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = [
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-  },
-  {
-    text: '型号',
-    value: 'manufacturer',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-  }]
+  { text: '文件名称', value: 'fileName' },
+  { text: '文件编号', value: 'fileNo' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
 
 // 获取数据列表
 const fetchData = () => {

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 07b439b..f8fd6a9 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
@@ -167,6 +168,7 @@
   name: string
   organizeName: string
   id: string
+  deptId: string
 }
 // 实验室ref
 const laboratorydialog = ref()
@@ -199,6 +201,13 @@
 const personClick = () => {
   personListdialog.value.initDialog()
 }
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
   formInline.value.standardOwner = data.id
@@ -206,7 +215,7 @@
 }
 // 选择完科室的回调函数
 const laboratoryListAdd = (data: rowReturn) => {
-  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratory = data.deptId
   formInline.value.standardLaboratoryName = data.organizeName
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
@@ -227,6 +236,7 @@
   <app-container>
     <div class="info-content">
       <el-form
+        id="form"
         ref="ruleFormRef"
         :model="formInline"
         label-position="right"
@@ -587,46 +597,39 @@
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
-                type="datetime"
+                v-model="simulateObject.data"
+                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
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
-                size="default"
-                style="width: 100%;"
+              <el-input
+                v-model.trim="simulateObject.certificateNo"
                 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="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                v-model="simulateObject.authorityOfDate"
+                type="date"
                 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>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6453565..6bda8e3 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -29,22 +29,11 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = [
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-  },
-  {
-    text: '型号',
-    value: 'manufacturer',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-  }]
+  { text: '文件名称', value: 'fileName' },
+  { text: '文件编号', value: 'fileNo' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index ff45abc..59f7d87 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -243,17 +243,32 @@
 const listIndex = ref(0)
 // 新增计量人员
 const measurementPersonnelAddRow = () => {
-  measurementPersonnel.value.push({})
+  if (measurementPersonnel.value.length >= 1 && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条计量人员信息')
+  }
+  else {
+    measurementPersonnel.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增标准配套设备
 const corollaryEquipmentAddRow = () => {
-  corollaryEquipment.value.push({})
+  if (corollaryEquipment.value.length >= 1 && !corollaryEquipment.value[corollaryEquipment.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条配套设备信息')
+  }
+  else {
+    corollaryEquipment.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增检定规程
 const regulationVerificationAddRow = () => {
-  regulationVerification.value.push({})
+  if (regulationVerification.value.length >= 1 && !regulationVerification.value[regulationVerification.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条检定规程信息')
+  }
+  else {
+    regulationVerification.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 设备ref
@@ -350,6 +365,7 @@
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
     measurementPersonnel.value[listIndex.value].userId = object.id
+    delete object.id
     setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
@@ -364,6 +380,7 @@
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    delete data.id
     getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
   }
   else {
@@ -378,6 +395,7 @@
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
     regulationVerification.value[listIndex.value].verifyRegulationId = data.id
     regulationVerification.value[listIndex.value].name = data.fileName
+    delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
   }
   else {

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 07b439b..f8fd6a9 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
@@ -167,6 +168,7 @@
   name: string
   organizeName: string
   id: string
+  deptId: string
 }
 // 实验室ref
 const laboratorydialog = ref()
@@ -199,6 +201,13 @@
 const personClick = () => {
   personListdialog.value.initDialog()
 }
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
   formInline.value.standardOwner = data.id
@@ -206,7 +215,7 @@
 }
 // 选择完科室的回调函数
 const laboratoryListAdd = (data: rowReturn) => {
-  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratory = data.deptId
   formInline.value.standardLaboratoryName = data.organizeName
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
@@ -227,6 +236,7 @@
   <app-container>
     <div class="info-content">
       <el-form
+        id="form"
         ref="ruleFormRef"
         :model="formInline"
         label-position="right"
@@ -587,46 +597,39 @@
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
-                type="datetime"
+                v-model="simulateObject.data"
+                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
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
-                size="default"
-                style="width: 100%;"
+              <el-input
+                v-model.trim="simulateObject.certificateNo"
                 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="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                v-model="simulateObject.authorityOfDate"
+                type="date"
                 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>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6453565..6bda8e3 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -29,22 +29,11 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = [
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-  },
-  {
-    text: '型号',
-    value: 'manufacturer',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-  }]
+  { text: '文件名称', value: 'fileName' },
+  { text: '文件编号', value: 'fileNo' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index ff45abc..59f7d87 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -243,17 +243,32 @@
 const listIndex = ref(0)
 // 新增计量人员
 const measurementPersonnelAddRow = () => {
-  measurementPersonnel.value.push({})
+  if (measurementPersonnel.value.length >= 1 && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条计量人员信息')
+  }
+  else {
+    measurementPersonnel.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增标准配套设备
 const corollaryEquipmentAddRow = () => {
-  corollaryEquipment.value.push({})
+  if (corollaryEquipment.value.length >= 1 && !corollaryEquipment.value[corollaryEquipment.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条配套设备信息')
+  }
+  else {
+    corollaryEquipment.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增检定规程
 const regulationVerificationAddRow = () => {
-  regulationVerification.value.push({})
+  if (regulationVerification.value.length >= 1 && !regulationVerification.value[regulationVerification.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条检定规程信息')
+  }
+  else {
+    regulationVerification.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 设备ref
@@ -350,6 +365,7 @@
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
     measurementPersonnel.value[listIndex.value].userId = object.id
+    delete object.id
     setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
@@ -364,6 +380,7 @@
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    delete data.id
     getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
   }
   else {
@@ -378,6 +395,7 @@
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
     regulationVerification.value[listIndex.value].verifyRegulationId = data.id
     regulationVerification.value[listIndex.value].name = data.fileName
+    delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
   }
   else {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 61e887a..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -75,6 +75,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('sourceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 07b439b..f8fd6a9 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
@@ -167,6 +168,7 @@
   name: string
   organizeName: string
   id: string
+  deptId: string
 }
 // 实验室ref
 const laboratorydialog = ref()
@@ -199,6 +201,13 @@
 const personClick = () => {
   personListdialog.value.initDialog()
 }
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
   formInline.value.standardOwner = data.id
@@ -206,7 +215,7 @@
 }
 // 选择完科室的回调函数
 const laboratoryListAdd = (data: rowReturn) => {
-  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratory = data.deptId
   formInline.value.standardLaboratoryName = data.organizeName
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
@@ -227,6 +236,7 @@
   <app-container>
     <div class="info-content">
       <el-form
+        id="form"
         ref="ruleFormRef"
         :model="formInline"
         label-position="right"
@@ -587,46 +597,39 @@
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
-                type="datetime"
+                v-model="simulateObject.data"
+                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
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
-                size="default"
-                style="width: 100%;"
+              <el-input
+                v-model.trim="simulateObject.certificateNo"
                 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="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                v-model="simulateObject.authorityOfDate"
+                type="date"
                 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>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6453565..6bda8e3 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -29,22 +29,11 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = [
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-  },
-  {
-    text: '型号',
-    value: 'manufacturer',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-  }]
+  { text: '文件名称', value: 'fileName' },
+  { text: '文件编号', value: 'fileNo' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index ff45abc..59f7d87 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -243,17 +243,32 @@
 const listIndex = ref(0)
 // 新增计量人员
 const measurementPersonnelAddRow = () => {
-  measurementPersonnel.value.push({})
+  if (measurementPersonnel.value.length >= 1 && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条计量人员信息')
+  }
+  else {
+    measurementPersonnel.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增标准配套设备
 const corollaryEquipmentAddRow = () => {
-  corollaryEquipment.value.push({})
+  if (corollaryEquipment.value.length >= 1 && !corollaryEquipment.value[corollaryEquipment.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条配套设备信息')
+  }
+  else {
+    corollaryEquipment.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增检定规程
 const regulationVerificationAddRow = () => {
-  regulationVerification.value.push({})
+  if (regulationVerification.value.length >= 1 && !regulationVerification.value[regulationVerification.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条检定规程信息')
+  }
+  else {
+    regulationVerification.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 设备ref
@@ -350,6 +365,7 @@
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
     measurementPersonnel.value[listIndex.value].userId = object.id
+    delete object.id
     setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
@@ -364,6 +380,7 @@
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    delete data.id
     getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
   }
   else {
@@ -378,6 +395,7 @@
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
     regulationVerification.value[listIndex.value].verifyRegulationId = data.id
     regulationVerification.value[listIndex.value].name = data.fileName
+    delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
   }
   else {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 61e887a..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -75,6 +75,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('sourceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 221bdca..2c5c2ff 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -200,7 +200,7 @@
         </el-form-item>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formData.businessScope"
@@ -212,7 +212,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="备注:">
             <el-input
               v-model="formData.remark"

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 07b439b..f8fd6a9 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
@@ -167,6 +168,7 @@
   name: string
   organizeName: string
   id: string
+  deptId: string
 }
 // 实验室ref
 const laboratorydialog = ref()
@@ -199,6 +201,13 @@
 const personClick = () => {
   personListdialog.value.initDialog()
 }
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
   formInline.value.standardOwner = data.id
@@ -206,7 +215,7 @@
 }
 // 选择完科室的回调函数
 const laboratoryListAdd = (data: rowReturn) => {
-  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratory = data.deptId
   formInline.value.standardLaboratoryName = data.organizeName
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
@@ -227,6 +236,7 @@
   <app-container>
     <div class="info-content">
       <el-form
+        id="form"
         ref="ruleFormRef"
         :model="formInline"
         label-position="right"
@@ -587,46 +597,39 @@
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
-                type="datetime"
+                v-model="simulateObject.data"
+                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
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
-                size="default"
-                style="width: 100%;"
+              <el-input
+                v-model.trim="simulateObject.certificateNo"
                 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="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                v-model="simulateObject.authorityOfDate"
+                type="date"
                 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>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6453565..6bda8e3 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -29,22 +29,11 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = [
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-  },
-  {
-    text: '型号',
-    value: 'manufacturer',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-  }]
+  { text: '文件名称', value: 'fileName' },
+  { text: '文件编号', value: 'fileNo' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index ff45abc..59f7d87 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -243,17 +243,32 @@
 const listIndex = ref(0)
 // 新增计量人员
 const measurementPersonnelAddRow = () => {
-  measurementPersonnel.value.push({})
+  if (measurementPersonnel.value.length >= 1 && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条计量人员信息')
+  }
+  else {
+    measurementPersonnel.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增标准配套设备
 const corollaryEquipmentAddRow = () => {
-  corollaryEquipment.value.push({})
+  if (corollaryEquipment.value.length >= 1 && !corollaryEquipment.value[corollaryEquipment.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条配套设备信息')
+  }
+  else {
+    corollaryEquipment.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增检定规程
 const regulationVerificationAddRow = () => {
-  regulationVerification.value.push({})
+  if (regulationVerification.value.length >= 1 && !regulationVerification.value[regulationVerification.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条检定规程信息')
+  }
+  else {
+    regulationVerification.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 设备ref
@@ -350,6 +365,7 @@
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
     measurementPersonnel.value[listIndex.value].userId = object.id
+    delete object.id
     setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
@@ -364,6 +380,7 @@
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    delete data.id
     getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
   }
   else {
@@ -378,6 +395,7 @@
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
     regulationVerification.value[listIndex.value].verifyRegulationId = data.id
     regulationVerification.value[listIndex.value].name = data.fileName
+    delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
   }
   else {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 61e887a..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -75,6 +75,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('sourceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 221bdca..2c5c2ff 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -200,7 +200,7 @@
         </el-form-item>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formData.businessScope"
@@ -212,7 +212,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="备注:">
             <el-input
               v-model="formData.remark"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 779821b..e388775 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -533,7 +533,7 @@
             </el-form-item>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="formInline.businessScope"
@@ -545,7 +545,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="formInline.remark"
@@ -559,7 +559,7 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="附件:">
-                <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+                <show- v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
                 <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 07b439b..f8fd6a9 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
@@ -167,6 +168,7 @@
   name: string
   organizeName: string
   id: string
+  deptId: string
 }
 // 实验室ref
 const laboratorydialog = ref()
@@ -199,6 +201,13 @@
 const personClick = () => {
   personListdialog.value.initDialog()
 }
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
   formInline.value.standardOwner = data.id
@@ -206,7 +215,7 @@
 }
 // 选择完科室的回调函数
 const laboratoryListAdd = (data: rowReturn) => {
-  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratory = data.deptId
   formInline.value.standardLaboratoryName = data.organizeName
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
@@ -227,6 +236,7 @@
   <app-container>
     <div class="info-content">
       <el-form
+        id="form"
         ref="ruleFormRef"
         :model="formInline"
         label-position="right"
@@ -587,46 +597,39 @@
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
-                type="datetime"
+                v-model="simulateObject.data"
+                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
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
-                size="default"
-                style="width: 100%;"
+              <el-input
+                v-model.trim="simulateObject.certificateNo"
                 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="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                v-model="simulateObject.authorityOfDate"
+                type="date"
                 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>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6453565..6bda8e3 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -29,22 +29,11 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = [
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-  },
-  {
-    text: '型号',
-    value: 'manufacturer',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-  }]
+  { text: '文件名称', value: 'fileName' },
+  { text: '文件编号', value: 'fileNo' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index ff45abc..59f7d87 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -243,17 +243,32 @@
 const listIndex = ref(0)
 // 新增计量人员
 const measurementPersonnelAddRow = () => {
-  measurementPersonnel.value.push({})
+  if (measurementPersonnel.value.length >= 1 && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条计量人员信息')
+  }
+  else {
+    measurementPersonnel.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增标准配套设备
 const corollaryEquipmentAddRow = () => {
-  corollaryEquipment.value.push({})
+  if (corollaryEquipment.value.length >= 1 && !corollaryEquipment.value[corollaryEquipment.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条配套设备信息')
+  }
+  else {
+    corollaryEquipment.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增检定规程
 const regulationVerificationAddRow = () => {
-  regulationVerification.value.push({})
+  if (regulationVerification.value.length >= 1 && !regulationVerification.value[regulationVerification.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条检定规程信息')
+  }
+  else {
+    regulationVerification.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 设备ref
@@ -350,6 +365,7 @@
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
     measurementPersonnel.value[listIndex.value].userId = object.id
+    delete object.id
     setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
@@ -364,6 +380,7 @@
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    delete data.id
     getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
   }
   else {
@@ -378,6 +395,7 @@
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
     regulationVerification.value[listIndex.value].verifyRegulationId = data.id
     regulationVerification.value[listIndex.value].name = data.fileName
+    delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
   }
   else {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 61e887a..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -75,6 +75,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('sourceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 221bdca..2c5c2ff 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -200,7 +200,7 @@
         </el-form-item>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formData.businessScope"
@@ -212,7 +212,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="备注:">
             <el-input
               v-model="formData.remark"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 779821b..e388775 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -533,7 +533,7 @@
             </el-form-item>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="formInline.businessScope"
@@ -545,7 +545,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="formInline.remark"
@@ -559,7 +559,7 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="附件:">
-                <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+                <show- v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
                 <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
diff --git a/src/views/measure/train/components/planListDialog.vue b/src/views/measure/train/components/planListDialog.vue
new file mode 100644
index 0000000..0703ad2
--- /dev/null
+++ b/src/views/measure/train/components/planListDialog.vue
@@ -0,0 +1,205 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import type { IOptions } from '../plan_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getDeptTree, getPlanList } from '@/api/system/plan'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const loadingTable = ref<boolean>(false)
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<TableColumn[]>([
+  {
+    text: '计划编号',
+    value: 'planNo',
+    align: 'center',
+  },
+  {
+    text: '培训名称',
+    value: 'planName',
+    align: 'center',
+  },
+  {
+    text: '主管部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '实施单位',
+    value: 'effectiveCompany',
+    align: 'center',
+  },
+  {
+    text: '培训内容',
+    value: 'trainContent',
+    align: 'center',
+  },
+])
+const list = ref([])
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPlanList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 search = () => {
+  fetchData(true)
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    ids: [],
+    trainEndTime: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击保存
+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
+  }
+  else {
+    ElMessage.warning('请先选择培训列表')
+  }
+}
+// 监听数据变化
+// watch(
+//   [() => props.list], ([newNums], [oldNums]) => {
+//     list.value = newNums
+//   },
+//   {
+//     immediate: true,
+//     deep: true,
+//   },
+// )
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.director" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :pagination="false" @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 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 07b439b..f8fd6a9 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
@@ -167,6 +168,7 @@
   name: string
   organizeName: string
   id: string
+  deptId: string
 }
 // 实验室ref
 const laboratorydialog = ref()
@@ -199,6 +201,13 @@
 const personClick = () => {
   personListdialog.value.initDialog()
 }
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
   formInline.value.standardOwner = data.id
@@ -206,7 +215,7 @@
 }
 // 选择完科室的回调函数
 const laboratoryListAdd = (data: rowReturn) => {
-  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratory = data.deptId
   formInline.value.standardLaboratoryName = data.organizeName
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
@@ -227,6 +236,7 @@
   <app-container>
     <div class="info-content">
       <el-form
+        id="form"
         ref="ruleFormRef"
         :model="formInline"
         label-position="right"
@@ -587,46 +597,39 @@
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
-                type="datetime"
+                v-model="simulateObject.data"
+                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
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
-                size="default"
-                style="width: 100%;"
+              <el-input
+                v-model.trim="simulateObject.certificateNo"
                 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="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                v-model="simulateObject.authorityOfDate"
+                type="date"
                 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>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6453565..6bda8e3 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -29,22 +29,11 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = [
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-  },
-  {
-    text: '型号',
-    value: 'manufacturer',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-  }]
+  { text: '文件名称', value: 'fileName' },
+  { text: '文件编号', value: 'fileNo' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index ff45abc..59f7d87 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -243,17 +243,32 @@
 const listIndex = ref(0)
 // 新增计量人员
 const measurementPersonnelAddRow = () => {
-  measurementPersonnel.value.push({})
+  if (measurementPersonnel.value.length >= 1 && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条计量人员信息')
+  }
+  else {
+    measurementPersonnel.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增标准配套设备
 const corollaryEquipmentAddRow = () => {
-  corollaryEquipment.value.push({})
+  if (corollaryEquipment.value.length >= 1 && !corollaryEquipment.value[corollaryEquipment.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条配套设备信息')
+  }
+  else {
+    corollaryEquipment.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增检定规程
 const regulationVerificationAddRow = () => {
-  regulationVerification.value.push({})
+  if (regulationVerification.value.length >= 1 && !regulationVerification.value[regulationVerification.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条检定规程信息')
+  }
+  else {
+    regulationVerification.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 设备ref
@@ -350,6 +365,7 @@
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
     measurementPersonnel.value[listIndex.value].userId = object.id
+    delete object.id
     setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
@@ -364,6 +380,7 @@
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    delete data.id
     getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
   }
   else {
@@ -378,6 +395,7 @@
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
     regulationVerification.value[listIndex.value].verifyRegulationId = data.id
     regulationVerification.value[listIndex.value].name = data.fileName
+    delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
   }
   else {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 61e887a..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -75,6 +75,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('sourceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 221bdca..2c5c2ff 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -200,7 +200,7 @@
         </el-form-item>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formData.businessScope"
@@ -212,7 +212,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="备注:">
             <el-input
               v-model="formData.remark"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 779821b..e388775 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -533,7 +533,7 @@
             </el-form-item>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="formInline.businessScope"
@@ -545,7 +545,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="formInline.remark"
@@ -559,7 +559,7 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="附件:">
-                <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+                <show- v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
                 <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
diff --git a/src/views/measure/train/components/planListDialog.vue b/src/views/measure/train/components/planListDialog.vue
new file mode 100644
index 0000000..0703ad2
--- /dev/null
+++ b/src/views/measure/train/components/planListDialog.vue
@@ -0,0 +1,205 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import type { IOptions } from '../plan_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getDeptTree, getPlanList } from '@/api/system/plan'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const loadingTable = ref<boolean>(false)
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<TableColumn[]>([
+  {
+    text: '计划编号',
+    value: 'planNo',
+    align: 'center',
+  },
+  {
+    text: '培训名称',
+    value: 'planName',
+    align: 'center',
+  },
+  {
+    text: '主管部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '实施单位',
+    value: 'effectiveCompany',
+    align: 'center',
+  },
+  {
+    text: '培训内容',
+    value: 'trainContent',
+    align: 'center',
+  },
+])
+const list = ref([])
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPlanList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 search = () => {
+  fetchData(true)
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    ids: [],
+    trainEndTime: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击保存
+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
+  }
+  else {
+    ElMessage.warning('请先选择培训列表')
+  }
+}
+// 监听数据变化
+// watch(
+//   [() => props.list], ([newNums], [oldNums]) => {
+//     list.value = newNums
+//   },
+//   {
+//     immediate: true,
+//     deep: true,
+//   },
+// )
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.director" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :pagination="false" @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/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 61f6af0..2b67950 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -51,9 +51,9 @@
 const ruleFormRef = ref<FormInstance>()
 const columns = [
   { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
+  { text: '单位名称', value: 'deptName' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
+  { text: '签到时间', value: 'createtime' },
 ]
 const dialogVisible = ref(false)
 const addPersonList = ref({
@@ -91,15 +91,6 @@
     { required: true, message: '培训内容不能为空', trigger: 'blur' },
   ],
 }) // 表单验证规则
-// 新增校验规则
-const addRules = ref({
-  name: [{ required: true, message: '学员名称不能为空', trigger: 'blur' }],
-  company: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
-  technologyJob: [
-    { required: true, message: '技术职称不能为空', trigger: 'blur' },
-  ],
-  signTime: [{ required: true, message: '签到时间不能为空', trigger: 'blur' }],
-}) // 表单验证规则
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -112,22 +103,30 @@
   userListRef.value.initDialog()
 }
 const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
   )
-  dialogVisible.value = true
+}
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const userTrainRef = ref()
+// 选择计量人员
+const handleClick = (index: number) => {
+  listIndex.value = index
+  userTrainRef.value.initDialog()
 }
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleClose()
-}
+// // 点击弹窗的完成追加到表格数组中
+// const addPushList = () => {
+//   formInline.value.trainStaffList.push(
+//     JSON.parse(JSON.stringify(addPersonList.value)),
+//   )
+//   handleClose()
+// }
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
@@ -151,7 +150,6 @@
 }
 // 选择完负责人的函数
 const confirmPerson = (object: confirmPersonType) => {
-  console.log(object)
   formInline.value.director = object.name
 }
 if (infoId.value && infoId.value !== '') {
@@ -159,6 +157,12 @@
     formInline.value = res.data
   })
 }
+// 选完计量人员
+const confirmTrainPerson = (object: confirmPersonType) => {
+  console.log(object)
+  formInline.value.trainStaffList[listIndex.value] = object
+  formInline.value.trainStaffList[listIndex.value].staffId = object.id
+}
 // 点击提交
 const getAddList = async (
   formEl: FormInstance | undefined,
@@ -270,11 +274,11 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
+            <el-form-item label="计划编号:">
               <el-input
                 v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 计划编号'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -312,6 +316,7 @@
               <el-date-picker
                 v-model="formInline.trainTime"
                 type="datetime"
+                style="width: 100%;"
                 placeholder="培训时间"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
@@ -402,12 +407,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="formInline.trainStaffList"
@@ -422,55 +427,34 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
-        />
+          align="center"
+        >
+          <template
+            v-if="item.text === '学员名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
   </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-      :rules="addRules"
-    >
-      <el-form-item label="学员名称" prop="name">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="company">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称" prop="technologyJob">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间" prop="signTime">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="addPushList">
-          完成
-        </el-button>
-        <el-button @click="dialogVisible = false">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
   <!-- 选择用户列表组件 -->
   <user-list-dialog ref="userListRef" @add="confirmPerson" />
+  <!-- 选择计量人员组件列表 -->
+  <user-list-dialog ref="userTrainRef" @add="confirmTrainPerson" />
 </template>

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 07b439b..f8fd6a9 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
@@ -167,6 +168,7 @@
   name: string
   organizeName: string
   id: string
+  deptId: string
 }
 // 实验室ref
 const laboratorydialog = ref()
@@ -199,6 +201,13 @@
 const personClick = () => {
   personListdialog.value.initDialog()
 }
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
   formInline.value.standardOwner = data.id
@@ -206,7 +215,7 @@
 }
 // 选择完科室的回调函数
 const laboratoryListAdd = (data: rowReturn) => {
-  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratory = data.deptId
   formInline.value.standardLaboratoryName = data.organizeName
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
@@ -227,6 +236,7 @@
   <app-container>
     <div class="info-content">
       <el-form
+        id="form"
         ref="ruleFormRef"
         :model="formInline"
         label-position="right"
@@ -587,46 +597,39 @@
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
-                type="datetime"
+                v-model="simulateObject.data"
+                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
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
-                size="default"
-                style="width: 100%;"
+              <el-input
+                v-model.trim="simulateObject.certificateNo"
                 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="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                v-model="simulateObject.authorityOfDate"
+                type="date"
                 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>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6453565..6bda8e3 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -29,22 +29,11 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = [
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-  },
-  {
-    text: '型号',
-    value: 'manufacturer',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-  }]
+  { text: '文件名称', value: 'fileName' },
+  { text: '文件编号', value: 'fileNo' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index ff45abc..59f7d87 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -243,17 +243,32 @@
 const listIndex = ref(0)
 // 新增计量人员
 const measurementPersonnelAddRow = () => {
-  measurementPersonnel.value.push({})
+  if (measurementPersonnel.value.length >= 1 && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条计量人员信息')
+  }
+  else {
+    measurementPersonnel.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增标准配套设备
 const corollaryEquipmentAddRow = () => {
-  corollaryEquipment.value.push({})
+  if (corollaryEquipment.value.length >= 1 && !corollaryEquipment.value[corollaryEquipment.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条配套设备信息')
+  }
+  else {
+    corollaryEquipment.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增检定规程
 const regulationVerificationAddRow = () => {
-  regulationVerification.value.push({})
+  if (regulationVerification.value.length >= 1 && !regulationVerification.value[regulationVerification.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条检定规程信息')
+  }
+  else {
+    regulationVerification.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 设备ref
@@ -350,6 +365,7 @@
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
     measurementPersonnel.value[listIndex.value].userId = object.id
+    delete object.id
     setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
@@ -364,6 +380,7 @@
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    delete data.id
     getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
   }
   else {
@@ -378,6 +395,7 @@
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
     regulationVerification.value[listIndex.value].verifyRegulationId = data.id
     regulationVerification.value[listIndex.value].name = data.fileName
+    delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
   }
   else {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 61e887a..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -75,6 +75,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('sourceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 221bdca..2c5c2ff 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -200,7 +200,7 @@
         </el-form-item>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formData.businessScope"
@@ -212,7 +212,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="备注:">
             <el-input
               v-model="formData.remark"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 779821b..e388775 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -533,7 +533,7 @@
             </el-form-item>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="formInline.businessScope"
@@ -545,7 +545,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="formInline.remark"
@@ -559,7 +559,7 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="附件:">
-                <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+                <show- v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
                 <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
diff --git a/src/views/measure/train/components/planListDialog.vue b/src/views/measure/train/components/planListDialog.vue
new file mode 100644
index 0000000..0703ad2
--- /dev/null
+++ b/src/views/measure/train/components/planListDialog.vue
@@ -0,0 +1,205 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import type { IOptions } from '../plan_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getDeptTree, getPlanList } from '@/api/system/plan'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const loadingTable = ref<boolean>(false)
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<TableColumn[]>([
+  {
+    text: '计划编号',
+    value: 'planNo',
+    align: 'center',
+  },
+  {
+    text: '培训名称',
+    value: 'planName',
+    align: 'center',
+  },
+  {
+    text: '主管部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '实施单位',
+    value: 'effectiveCompany',
+    align: 'center',
+  },
+  {
+    text: '培训内容',
+    value: 'trainContent',
+    align: 'center',
+  },
+])
+const list = ref([])
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPlanList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 search = () => {
+  fetchData(true)
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    ids: [],
+    trainEndTime: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击保存
+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
+  }
+  else {
+    ElMessage.warning('请先选择培训列表')
+  }
+}
+// 监听数据变化
+// watch(
+//   [() => props.list], ([newNums], [oldNums]) => {
+//     list.value = newNums
+//   },
+//   {
+//     immediate: true,
+//     deep: true,
+//   },
+// )
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.director" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :pagination="false" @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/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 61f6af0..2b67950 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -51,9 +51,9 @@
 const ruleFormRef = ref<FormInstance>()
 const columns = [
   { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
+  { text: '单位名称', value: 'deptName' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
+  { text: '签到时间', value: 'createtime' },
 ]
 const dialogVisible = ref(false)
 const addPersonList = ref({
@@ -91,15 +91,6 @@
     { required: true, message: '培训内容不能为空', trigger: 'blur' },
   ],
 }) // 表单验证规则
-// 新增校验规则
-const addRules = ref({
-  name: [{ required: true, message: '学员名称不能为空', trigger: 'blur' }],
-  company: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
-  technologyJob: [
-    { required: true, message: '技术职称不能为空', trigger: 'blur' },
-  ],
-  signTime: [{ required: true, message: '签到时间不能为空', trigger: 'blur' }],
-}) // 表单验证规则
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -112,22 +103,30 @@
   userListRef.value.initDialog()
 }
 const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
   )
-  dialogVisible.value = true
+}
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const userTrainRef = ref()
+// 选择计量人员
+const handleClick = (index: number) => {
+  listIndex.value = index
+  userTrainRef.value.initDialog()
 }
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleClose()
-}
+// // 点击弹窗的完成追加到表格数组中
+// const addPushList = () => {
+//   formInline.value.trainStaffList.push(
+//     JSON.parse(JSON.stringify(addPersonList.value)),
+//   )
+//   handleClose()
+// }
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
@@ -151,7 +150,6 @@
 }
 // 选择完负责人的函数
 const confirmPerson = (object: confirmPersonType) => {
-  console.log(object)
   formInline.value.director = object.name
 }
 if (infoId.value && infoId.value !== '') {
@@ -159,6 +157,12 @@
     formInline.value = res.data
   })
 }
+// 选完计量人员
+const confirmTrainPerson = (object: confirmPersonType) => {
+  console.log(object)
+  formInline.value.trainStaffList[listIndex.value] = object
+  formInline.value.trainStaffList[listIndex.value].staffId = object.id
+}
 // 点击提交
 const getAddList = async (
   formEl: FormInstance | undefined,
@@ -270,11 +274,11 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
+            <el-form-item label="计划编号:">
               <el-input
                 v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 计划编号'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -312,6 +316,7 @@
               <el-date-picker
                 v-model="formInline.trainTime"
                 type="datetime"
+                style="width: 100%;"
                 placeholder="培训时间"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
@@ -402,12 +407,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="formInline.trainStaffList"
@@ -422,55 +427,34 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
-        />
+          align="center"
+        >
+          <template
+            v-if="item.text === '学员名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
   </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-      :rules="addRules"
-    >
-      <el-form-item label="学员名称" prop="name">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="company">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称" prop="technologyJob">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间" prop="signTime">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="addPushList">
-          完成
-        </el-button>
-        <el-button @click="dialogVisible = false">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
   <!-- 选择用户列表组件 -->
   <user-list-dialog ref="userListRef" @add="confirmPerson" />
+  <!-- 选择计量人员组件列表 -->
+  <user-list-dialog ref="userTrainRef" @add="confirmTrainPerson" />
 </template>
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 91e9bf4..afdae6d 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions } from './plan_interface'
 import userListDialog from './components/userListDialog.vue'
+import PlanListDialog from './components/planListDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useUserStore from '@/store/modules/user.ts'
 import {
@@ -10,7 +11,6 @@
   getListLogAdd,
   getListLogDetail,
   getListLogupdate,
-  getPlanIdList,
 } from '@/api/system/plan'
 
 const loading = ref(false) // 表单加载状态
@@ -76,6 +76,7 @@
   trainEffect: [{ required: true, message: '培训效果不能为空', trigger: 'blur' }],
   problems: [{ required: true, message: '存在问题不能为空', trigger: 'blur' }],
   improveMethod: [{ required: true, message: '改进措施不能为空', trigger: 'blur' }],
+  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userListRef = ref()
 const addPersonList = ref({
@@ -92,21 +93,6 @@
 const ListDetail = ref([])
 // 控制是否显示输入框开关
 const isNameShow = ref(true)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    createTime: '',
-    deptId: 0,
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    trainTime: '',
-  }
-  getPlanIdList(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -124,8 +110,8 @@
     remark: '',
     signTime: '',
     technologyJob: '',
-    planId: 0,
-    staffId: 0,
+    planId: '',
+    staffId: '',
     isNameShow: false,
   }
   trainList.value.push(object)
@@ -171,6 +157,8 @@
 // 点击删除和编辑的参数类型
 interface rowReturn {
   isNameShow: boolean
+  id: string
+  planName: string
 }
 // 双击表格中默认显示的name
 const dblclickName = (row: rowReturn) => {
@@ -192,6 +180,7 @@
         if (buttonType === '提交' && pageType.value !== 'edit') {
           getListLogAdd(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('提交成功')
               close()
             }
           })
@@ -205,6 +194,7 @@
           formInline.value.id = infoId.value
           getListLogupdate(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('提交成功')
               close()
             }
           })
@@ -230,10 +220,28 @@
   userListRef.value.initDialog()
   listIndex.value = index
 }
+
+const planListDialog = ref()
+// 选择培训数据
+const selectPlanId = () => {
+  planListDialog.value.initDialog()
+}
+// 选择培训数据完成之后
+const confirmPlan = (data: rowReturn) => {
+  getListDetail({ id: data.id }).then((res) => {
+    ListDetail.value = res.data.trainStaffList
+    res.data.preparer = name
+    formInline.value = { ...res.data }
+    formInline.value.planId = data.id
+    formInline.value.trainName = data.planName
+  })
+}
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: rowReturn) => {
   if (!trainList.value.includes(object)) {
     trainList.value[listIndex.value] = object
+    trainList.value[listIndex.value].staffId = object.id
+    delete trainList.value[listIndex.value].id
   }
   else {
     ElMessage.warning('该学员已经存在')
@@ -273,11 +281,11 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="编号:" prop="logNo">
+            <el-form-item label="培训计划编号:">
               <el-input
                 v-model="formInline.logNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入编号'"
-                :disabled="pageType === 'detail'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 培训计划编号'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -291,22 +299,22 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item v-if="infoId === ''" label="计划编号:" prop="planId">
-              <el-select
+            <el-form-item label="计划编号:" prop="planId">
+              <el-input
                 v-model="formInline.planId"
-                clearable
-                placeholder="计划编号"
-                size="default"
+                :placeholder="pageType === 'detail' ? '无' : '请选择计划编号'"
                 :disabled="pageType === 'detail'"
-                @change="selectChange"
               >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.planName"
-                  :value="item.id"
-                />
-              </el-select>
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPlanId"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -373,6 +381,17 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
+            <el-form-item label="培训内容:" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
             <el-form-item label="培训效果:" prop="trainEffect">
               <el-input
                 v-model="formInline.trainEffect"
@@ -461,5 +480,7 @@
   </app-container>
   <!-- 选择用户列表组件 -->
   <user-list-dialog ref="userListRef" :list="formInline.trainStaffList" @add="confirmPerson" />
+  <!-- 选择培训数据组件 -->
+  <plan-list-dialog ref="planListDialog" @add="confirmPlan" />
 </template>
 

diff --git a/src/api/device/standard.ts b/src/api/device/standard.ts
index 655d6e7..064780f 100644
--- a/src/api/device/standard.ts
+++ b/src/api/device/standard.ts
@@ -73,6 +73,15 @@
   })
 }
 
+// 删除申请列表信息
+export function getOperateDelete(data: object) {
+  return request({
+    url: '/standard/approval/operate/delete',
+    method: 'post',
+    data,
+  })
+}
+
 // 新建申请列表信息
 export function getStandardLisAdd(data: object) {
   return request({
diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts
index 21710f8..cf3ce2d 100644
--- a/src/router/modules/business.ts
+++ b/src/router/modules/business.ts
@@ -209,13 +209,45 @@
         name: 'reportOnCredentialsAdd',
         component: () => import('@/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue'),
         meta: {
-          title: '检测详情',
+          title: '证书报告详情',
           icon: 'ep:key',
           sidebar: false,
           breadcrumb: true,
           activeMenu: '/lab/reportOnCredentialsApproval',
         },
       },
+      {
+        path: 'primitiveLogList',
+        name: 'PrimitiveLogList',
+        component: () => import('@/views/business/lab/primitiveLog/primitiveLogList.vue'),
+        meta: {
+          title: '原始记录',
+          icon: 'ep:key',
+          auth: '/lab/primitiveLogList',
+        },
+      },
+      {
+        path: 'environmentalList',
+        name: 'EnvironmentalList',
+        component: () => import('@/views/business/lab/environmental/environmentalList.vue'),
+        meta: {
+          title: '环境记录单',
+          icon: 'ep:key',
+          auth: '/lab/environmentalList',
+        },
+      },
+      {
+        path: 'environmentalList/:type/:id?',
+        name: 'EnvironmentalAdd',
+        component: () => import('@/views/business/lab/environmental/environmentalAdd.vue'),
+        meta: {
+          title: '环境记录单详情',
+          icon: 'ep:key',
+          sidebar: false,
+          breadcrumb: true,
+          activeMenu: '/lab/environmentalList',
+        },
+      },
     ],
   },
 ]
diff --git a/src/router/modules/device.ts b/src/router/modules/device.ts
index 993d66c..cbc5c47 100644
--- a/src/router/modules/device.ts
+++ b/src/router/modules/device.ts
@@ -238,7 +238,7 @@
         },
       },
       {
-        path: ':type/:id?',
+        path: 'Apply:type/:id?',
         name: 'standardListAdd',
         component: () => import('@/views/device/standardEquipment/components/listApply/listPageAdd.vue'),
         meta: {
diff --git a/src/views/business/lab/environmental/environmentalAdd.vue b/src/views/business/lab/environmental/environmentalAdd.vue
new file mode 100644
index 0000000..e572d09
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalAdd.vue
@@ -0,0 +1,250 @@
+<script lang="ts" setup name="PlanAdd">
+import type { FormInstance } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import dayjs from 'dayjs'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import useUserStore from '@/store/modules/user'
+import {
+  getDeptTree,
+  getListDetail,
+  getListSave,
+  getListSubmit,
+  getListUpdate,
+} from '@/api/system/plan'
+const infoId = ref('') // id
+const { name } = useUserStore()
+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({
+  createTime: null,
+  deptId: '',
+  deptName: null,
+  director: '',
+  effectiveCompany: null,
+  id: '',
+  planName: '',
+  planNo: null,
+  remark: null,
+  trainAddress: null,
+  trainContent: null,
+  trainHour: null,
+  trainNumber: null,
+  trainPerson: name,
+  trainStaffList: [],
+  trainTime: dayjs(`${new Date()}`).format('YYYY.MM.DD h:m:s'),
+})
+const addId = ref('') // 保存后的id
+const ruleFormRef = ref<FormInstance>()
+
+const selectionList = ref([
+  { text: '101', value: '101' },
+  { text: '102', value: '102' },
+  { text: '103', value: '103' },
+  { text: '104', value: '104' },
+])
+// 校验规则
+const rules = ref({
+  planName: [{ required: true, message: '房间号不能为空', trigger: 'blur' }],
+  trainPerson: [
+    { required: true, message: '记录人不能为空', trigger: 'blur' },
+  ],
+  trainNumber: [
+    { required: true, message: '培训人数不能为空', trigger: 'blur' },
+  ],
+  trainTime: [{ required: true, message: '记录时间不能为空', trigger: 'blur' }],
+  trainAddress: [
+    { required: true, message: '湿度(%)不能为空', trigger: 'blur' },
+  ],
+  trainHour: [{ required: true, message: '温度(℃)不能为空', trigger: 'blur' }],
+  effectiveCompany: [
+    { required: true, message: '输出电压(V)不能为空', trigger: 'blur' },
+  ],
+  trainContent: [
+    { required: true, message: '零地电压(V)不能为空', trigger: 'blur' },
+  ],
+}) // 表单验证规则
+
+// 初始化router
+const $router = useRouter()
+// 关闭新增页面的回调
+const close = () => {
+  $router.back()
+}
+
+if (infoId.value && infoId.value !== '') {
+  getListDetail({ id: infoId.value }).then((res) => {
+    formInline.value = res.data
+  })
+}
+// 点击保存
+const preserve = async (formEl: FormInstance | undefined) => {
+  if (!formEl) {
+    return
+  }
+  await formEl.validate((valid, fields) => {
+    if (valid) {
+      ElMessageBox.confirm('确认提交吗？', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        // getListSave(formInline.value).then((res) => {
+        //   if (res.code === 200) {
+        //     addId.value = res.data.id
+        //     ElMessage.success('保存成功！')
+        //   }
+        // })
+      })
+    }
+  })
+}
+// 打印
+const printObj = ref({
+  id: 'form', // 需要打印元素的id
+  popTitle: '环境记录单模板', // 打印配置页上方的标题
+  extraHead: '', // 最上方的头部文字，附加在head标签上的额外标签，使用逗号分割
+  preview: false, // 是否启动预览模式，默认是false
+  standard: '',
+  extarCss: '',
+})
+</script>
+
+<template>
+  <app-container>
+    <detail-page :title="`环境记录单-${textMap[pageType]}`">
+      <template #btns>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="primary"
+          @click="
+            preserve(ruleFormRef)
+          "
+        >
+          提交
+        </el-button>
+        <el-button v-else v-print="printObj" type="primary">
+          打印
+        </el-button>
+        <el-button type="info" @click="close">
+          关闭
+        </el-button>
+      </template>
+      <el-form
+        id="form"
+        ref="ruleFormRef"
+        :model="formInline"
+        class="demo-form-inline"
+        :rules="rules"
+        label-width="auto"
+        label-position="right"
+      >
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="环境记录单:">
+              <el-input
+                v-model="formInline.planNo"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 环境记录单号'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="房间号:" prop="planName">
+              <el-select
+                v-model="formInline.planName"
+                clearable
+                :placeholder="pageType === 'detail' ? '无' : '请选择房间号'"
+                size="default"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in selectionList"
+                  :key="item.value"
+                  :label="item.text"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录人:" prop="trainPerson">
+              <el-input
+                v-model="formInline.trainPerson"
+                :placeholder="pageType === 'detail' ? '无' : '请输入记录人'"
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="记录时间:" prop="trainTime">
+              <el-date-picker
+                v-model="formInline.trainTime"
+                type="datetime"
+                :placeholder="pageType === 'detail' ? '无' : '请选择记录时间'"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD h:m:s"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="trainHour">
+              <el-input
+                v-model="formInline.trainHour"
+                :placeholder="pageType === 'detail' ? '无' : '请输入温度(℃)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="湿度(%):" prop="trainAddress">
+              <el-input
+                v-model="formInline.trainAddress"
+                :placeholder="pageType === 'detail' ? '无' : '请输入湿度(%)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="输出电压(V):" prop="effectiveCompany">
+              <el-input
+                v-model="formInline.effectiveCompany"
+                :placeholder="pageType === 'detail' ? '无' : '请输入输出电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="零地电压(V):" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入零地电压(V)'"
+                :disabled="pageType === 'detail'"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </detail-page>
+  </app-container>
+</template>
diff --git a/src/views/business/lab/environmental/environmentalList.vue b/src/views/business/lab/environmental/environmentalList.vue
new file mode 100644
index 0000000..98230be
--- /dev/null
+++ b/src/views/business/lab/environmental/environmentalList.vue
@@ -0,0 +1,310 @@
+<script lang="ts" setup name="EnvironmentalList">
+import type { Ref } from 'vue'
+import { getCurrentInstance, reactive, ref } from 'vue'
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
+import type { IOptions, ISupplier, IlistQuery, IlistType } from './plan_interface'
+import QrDialog from '@/components/QrDialog/index.vue'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { exportExcel } from '@/utils/exportXlsx'
+import { exportPlanList, getDeptTree, getListDelete, getPlanList } from '@/api/system/plan'
+import { printJSON } from '@/utils/printUtils'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { exportFile } from '@/utils/exportUtils'
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+const checkoutList = ref<string[]>([])
+const list = ref<ISupplier[]>([])
+const total = ref(0)
+const show = ref(true)
+
+const loadingTable = ref(false)
+// 初始化路由
+// 培训时间数组
+const trainTime = ref('')
+
+const $router = useRouter()
+const fetchData = (isNowPage: boolean) => {
+  listQuery.value.trainStartTime = trainTime.value[0] || ''
+  listQuery.value.trainEndTime = trainTime.value[1] || ''
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  list.value = [{ text: 'xxx' }]
+  loadingTable.value = false
+}
+fetchData(true)
+const { proxy } = getCurrentInstance() as any
+// 表头
+const columns = 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',
+    width: '180',
+    align: 'center',
+  },
+  {
+    text: '输出电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+  {
+    text: '零地电压(V)',
+    value: 'text',
+    align: 'center',
+  },
+])
+// 搜索
+const searchList = () => {
+  fetchData(true)
+}
+
+// 重置
+const clearList = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    ids: [],
+    trainEndTime: '',
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+  trainTime.value = ''
+}
+// 导出
+const exportExcelBtn = () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '下载中请稍后',
+    background: 'rgba(255, 255, 255, 0.8)',
+  })
+  // if (list.value.length > 0) {
+  // }
+  // else {
+  //   ElMessage.warning('无数据可导出数据')
+  // }
+  loading.close()
+}
+// 关闭编辑
+const close = () => {
+  show.value = true
+  fetchData(true)
+}
+// 点击编辑id和删除row类型
+interface rowReturn {
+  id: string
+  text: string
+}
+// 点击编辑/详情
+const handleEdit = (row: rowReturn, pageType: 'edit' | 'detail') => {
+  $router.push(`/lab/environmentalList/${pageType}/${row.id}`)
+}
+// 点击删除
+const handleDelete = (index: string, row: rowReturn) => {
+  ElMessageBox.confirm(
+    `确认删除${row.text}吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  )
+    .then(() => {
+      // getListDelete({ id: row.id as string }).then((res) => {
+      //   if (res.code === 200) {
+      //     ElMessage({
+      //       type: 'success',
+      //       message: '删除成功',
+      //     })
+      //     fetchData(true)
+      //   }
+      // })
+    })
+}
+
+const handelClick = (text: string) => {}
+const handleSelectionChange = (e: any) => {
+  checkoutList.value = e.map((item: { id: string }) => item.id)
+}
+const add = () => {
+  $router.push('/lab/environmentalList/add')
+}
+const exportAll = () => {
+  exportExcelBtn()
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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)
+}
+// 打印列表
+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('无可打印内容')
+  }
+}
+</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.effectiveCompany"
+            placeholder="记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.director"
+            placeholder="房间号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-date-picker
+            v-model="trainTime"
+            type="datetimerange"
+            range-separator="到"
+            format="YYYY/MM/DD HH:mm:ss"
+            value-format="YYYY-MM-DD h:m:s"
+            start-placeholder="记录时间开始时间"
+            end-placeholder="记录时间结束时间"
+          />
+        </search-item>
+      </search-area>
+      <table-container>
+        <template #btns-right>
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/add')"
+            icon="icon-add"
+            title="新建"
+            type="primary"
+            @click="add"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/export')"
+            icon="icon-export"
+            title="导出"
+            type="primary"
+            @click="exportAll"
+          />
+          <icon-button
+            v-if="proxy.hasPerm('/measure/train/plan/print')"
+            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"
+          @multiSelect="handleSelectionChange"
+        >
+          <template #columns>
+            <el-table-column label="操作" align="center" width="190">
+              <template #default="{ row }">
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/edit')"
+                  size="small"
+                  type="primary"
+                  link
+                  @click="handleEdit(row, 'edit')"
+                >
+                  编辑
+                </el-button>
+                <el-button
+                  size="small"
+                  link
+                  type="primary"
+                  @click="handleEdit(row, 'detail')"
+                >
+                  详情
+                </el-button>
+                <el-button
+                  v-if="proxy.hasPerm('/measure/train/plan/delete')"
+                  size="small"
+                  link
+                  type="danger"
+                  @click="handleDelete(row.$index, row)"
+                >
+                  删除
+                </el-button>
+              </template>
+            </el-table-column>
+          </template>
+        </normal-table>
+      </table-container>
+    </app-container>
+  </div>
+</template>
diff --git a/src/views/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
new file mode 100644
index 0000000..a598765
--- /dev/null
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup name="PrimitiveLogList">
+// 我的检测
+</script>
+
+<template>
+  <app-container>
+    原始记录
+  </app-container>
+</template>
+
+<style lang="scss" scoped>
+// 样式
+</style>
diff --git a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
index 0b15289..97bea6f 100644
--- a/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
+++ b/src/views/business/lab/reportOnCredentials/components/baseInfo.vue
@@ -218,397 +218,395 @@
 </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"
+  <div class="info-content">
+    <el-form
+      ref="ruleFormRef"
+      :model="formInline"
+      label-position="right"
+      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-input
-                v-model.trim="formInline.constructionStandardUnitName"
-                :placeholder="buttonType === 'detail' ? '' : '建标单位名称'"
-                :disabled="buttonType === 'detail'"
-                class="full-width-input"
+              <el-option
+                v-for="item in standardOwnerOptions"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
               />
-            </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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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" />
@@ -619,21 +617,20 @@
             </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>
+      <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>
 </template>
 
 <style lang="scss" scoped>
@@ -657,6 +654,7 @@
 .info-content {
   padding: 15px;
   border-radius: 10px;
+  margin-top: 10px;
   background-color: #fff;
 }
 
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index bd02885..da533b7 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -1,167 +1,1266 @@
-<script lang="ts" setup name="reportOnCredentialsAdd">
+<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 baseInfo from './baseInfo.vue'
+import dayjs from 'dayjs'
+import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
 import { getTypeSelect } from '@/api/system/price'
-import { getStandardLisUpdate, getStandardListAdd, getStandardListDetail, getUsersDept } from '@/api/device/standard'
+import EquipmentDialog from '@/views/device/standardEquipment/components/standardList/equipmentDialog.vue'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
+import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
+import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
+const buttonArray = ref<string[]>([]) // 顶部按钮数组
 const pageType = ref('add') // 页面类型: add,edit, detail
 const buttonLoading = ref(false) // 按钮加载状态
 const textMap: { [key: string]: string } = {
   edit: '编辑',
   add: '新建',
-  detail: '详情',
-}// 字典
+  detail: '查看',
+} // 字典
 // 从路由中获取页面类型参数
 const $route = useRoute()
+const formId = ref<string>('')
+const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  formId.value = $route.query.formId as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
+  }
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  else {
+    buttonArray.value = ['同意', '驳回', '拒绝']
+  }
+  if ($route.query.id) {
+    infoId.value = $route.query.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
+const ruleFormRef = ref<FormInstance>()
+// 逻辑代码
+const formInline = ref({
+  assessDate: '',
+  assessmentUnit: '',
+  category: '',
+  categoryName: '',
+  constructionStandardProject: '',
+  constructionStandardUnitName: '',
+  contactInfo: '',
+  createTime: null,
+  createUser: null,
+  id: '',
+  isDel: null,
+  laboratoryOwner: '',
+  laboratoryOwnerContact: '',
+  minioFileName: '',
+  laboratoryOwnerName: '',
+  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: '',
+  authorityOfDate: '',
+  data: '',
+  uncertainty: '',
+  updateTime: null,
+  version: null,
 })
-// 初始化router
-const $router = useRouter()
-// 关闭新增页面的回调
-const close = () => {
-  $router.back()
+
+const fromListInfo = ref({
+  applyDept: '',
+  applyNo: '',
+  applyType: $route.query.applyType,
+  applyTypeName: '',
+  approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
+  approvalStatusName: '',
+  constructionStandardUnitName: '',
+  createTime: null,
+  createUser: null,
+  fileList: [],
+  id: null,
+  isDel: '',
+  processId: '',
+  remark: '',
+  standardEquipmentId: '',
+  standardName: '',
+  standardNo: '',
+  standardOwner: '',
+  updateTime: null,
+  version: null,
+  taskId: '',
+})
+// 下拉框数组类型
+interface IOptions {
+  id: string
+  name: string
+  value: string
+  organizeName: string
+  deptId: string
 }
-const setData = (newValue: object) => {
-  formInline.value = newValue
+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 approvalDialog = ref()
+const params = ref({
+  director: '',
+  meterMajor: '',
+  createEndTime: '',
+  createstartTime: '',
+  organizeName: '',
+  organizeNo: '',
+  organizeType: '2',
+  pdeptId: null,
+  offset: 1,
+  limit: 999999,
+})
+// 获取部门信息
+getUsersDept(params.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
+  })
+}
+// 数据
+const list = ref<object[]>([])
+// 标准配套设备更换表格总数
+const total = ref(0)
+// 审批弹窗开关
+const applyShow = ref(false)
+// 审批弹窗信息收集类型
+interface applyListType {
+  select: string
+  epilog: string
+  approval: string
+  approvalTime: string
+}
+// 审批弹窗信息收集
+const applyList = ref<applyListType>({
+  select: '',
+  epilog: '',
+  approval: '',
+  approvalTime: '',
+})
+// 标准配套设备表头类型
+interface columnsType {
+  text: string
+  value: string
+  align: string
+  required: Boolean
+  choose: Boolean
+  time: Boolean
 }
 
-interface checkedRecord {
-  text: string
+// 标准配套设备更换表头
+const columns = ref<columnsType[]>([
+  {
+    text: '设备名称',
+    value: 'equipmentName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '设备编号',
+    value: 'equipmentNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '型号',
+    value: 'modelNo',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '出厂编号',
+    value: 'mesureResult',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+  {
+    text: '证书有效期',
+    value: 'validDate',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: false,
+  },
+])
+// 标准配套设备更换查询条件
+const listQuery = ref<object>({
+  limit: 10,
+  offset: 1,
+})
+// 标准配套设备更换表格loding
+const loadingTable = ref(false)
+// 申请文档表头
+const columnsFiles = ref<columnsType[]>([
+  {
+    text: '文件编号',
+    value: 'fileName',
+    align: 'center',
+    required: true,
+    choose: true,
+    time: false,
+  },
+  {
+    text: '文件名称',
+    value: 'createTime',
+    align: 'center',
+    required: true,
+    choose: false,
+    time: true,
+  },
+  {
+    text: '文件代号',
+    value: 'remark',
+    align: 'center',
+    required: true,
+    time: false,
+    choose: false,
+  },
+])
+// 标准配套设备更换表格分页
+const changePage = () => {}
+getStandardOwnerOptions()
+// 添加表格数据对象
+const addList = ref({})
+// 添加表格弹窗开关
+const dialogVisible = ref(false)
+// 选择标准装置数据列表下拉框类型
+interface standardListType {
+  id: string
+  standardName: string
 }
-// 编辑获取详情的提交按钮
-const submitFormDetail = () => {
-  if (pageType.value === 'edit') {
-    formInline.value.id = infoId.value
-    getStandardLisUpdate(formInline.value).then((res) => {
+// 选择标准装置数据列表下拉框
+const standardList = ref<standardListType[]>([])
+// 初始化路由
+const $router = useRouter()
+// 关闭
+const close = () => {
+  // emit('close')
+  $router.back()
+}
+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 listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
+}
+// 上传请求
+const uploadQuarterlyEvaluateFile = (file: any) => {
+  const fd = new FormData()
+  fd.append('multipartFile', file.file)
+  UploadFile(fd).then((res) => {
+    if (res.code === 200) {
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
+      // 重置当前验证
+      ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
+    }
+  })
+}
+// 选择标准配套设备
+const equipmentDialog = ref()
+// 点击标准配套设备选择按钮
+const chooseList = (row: object, index: number) => {
+  listIndex.value = index
+  equipmentDialog.value.initDialog()
+}
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
+}
+// 增加申请文档列表
+const addRow = () => {
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
+}
+// 点击文件预览
+const uploadShow = (e: any) => {
+  const URL = window.URL || window.webkitURL
+  window.open(URL.createObjectURL(e.raw))
+}
+const fileRef = ref() // 文件上传input
+const onFileChange = (event: any) => {
+  // 原生上传
+  console.log(event.target.files)
+  if (event.target.files?.length !== 0) {
+    // 创建formdata对象
+    const fd = new FormData()
+    fd.append('multipartFile', event.target.files[0])
+    UploadFile(fd).then((res) => {
       if (res.code === 200) {
-        close()
+        formInline.value.minioFileName = res.data[0]
+        // 重置当前验证
+        ElMessage.success('文件上传成功')
+      }
+      else {
+        ElMessage.error(res.message)
+      }
+    })
+  }
+}
+const upload = () => {
+  fileRef.value.click()
+}
+
+// 表格选中的数组
+const SelectionList = ref<object[]>([])
+// 标准实验室发生改变row类型
+interface rowReturn {
+  phone: string
+  director: string
+  deptId: string
+  organizeName: string
+  id: string
+}
+// 标准实验室发生改变
+const changeDeptList = (row: rowReturn) => {}
+// 标准实验室清空时
+const clearDeptList = () => {}
+// 获取详情信息
+const getInfo = (id: string | number) => {
+  getStandardLisdetali({ id }).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.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
+  })
+}
+if (pageType.value !== 'add') {
+  getInfo(infoId.value)
+}
+
+// 取消
+const handleCancel = () => {
+  const params = {
+    taskId: fromListInfo.value.taskId!,
+    comments: '',
+  }
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
+      })
+    })
+  })
+}
+// 点击数据后的操作按钮
+const clickBtn = (buttonType: string) => {
+  switch (buttonType) {
+    case '同意':
+      approvalDialog.value.initDialog('agree', fromListInfo.value.taskId)
+      break
+    case '驳回':
+      approvalDialog.value.initDialog('reject', fromListInfo.value.taskId)
+      break
+    case '拒绝':
+      approvalDialog.value.initDialog('refuse', fromListInfo.value.taskId)
+      break
+    case '取消':
+      handleCancel()
+      break
+  }
+}
+// 保存后的id
+const addId = ref('')
+// 点击顶部一排按钮
+const getAddList = async (item: string, formEl: FormInstance | undefined) => {
+  if (item === '保存' && pageType.value === 'add') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '保存' && pageType.value === 'edit') {
+    if (!formEl) {
+      return
+    }
+    await formEl.validate((valid, fields) => {
+      if (valid) {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
+            if (res.code === 200) {
+              ElMessage.success('保存成功')
+              addId.value = res.data.id
+            }
+          })
+        })
+      }
+    })
+  }
+  else if (item === '提交') {
+    if (addId.value === '') {
+      ElMessage.warning('请先保存')
+    }
+    else {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
+        if (res.code === 200) {
+          close()
+        }
+      })
+    }
+  }
+  else {
+    clickBtn(item)
+  }
+}
+// 审批流程模拟数据
+const approvalActivities = [
+  {
+    name: '张三',
+    deptName: '审计局',
+    content: '同意',
+    timestamp: '2018-04-15 08:00:00',
+  },
+  {
+    name: '张三',
+    content: 'Approved',
+    timestamp: '2018-04-13',
+  },
+  {
+    name: '张三',
+    content: 'Success',
+    timestamp: '2018-04-11',
+  },
+]
+// 审批完成后的回调
+const approvalSuccess = () => {}
+// 选择标准装置弹窗ref
+const standarDialog = ref()
+// 选择了标准名称后
+const standardChange = () => {
+  standarDialog.value.initDialog()
+}
+
+// 点击关闭
+const handleClose = () => {
+  dialogVisible.value = false
+}
+// 标准配套设备更换表格删除行
+const removeRow = (type: string) => {
+  if (SelectionList.value.length > 0) {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      if (type == '1') {
+        // 删除设备行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
+          return !SelectionList.value.includes(item)
+        })
+        ElMessage.success('删除成功')
+      }
+      else {
+        // 删除文件行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
+        ElMessage.success('删除成功')
       }
     })
   }
   else {
-    // 打印
-
+    ElMessage.warning('请先选择需要删除的数据')
   }
 }
-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()
+// 文件表格多选框
+const handleSelectionChange = (e: any) => {
+  SelectionList.value = e
+}
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
+// 审批弹窗的关闭
+const applyListClose = () => {
+  applyShow.value = false
+}
+// 审批弹窗的提交
+const applyListSubmit = () => {
+  console.log(applyList.value)
+  if (applyList.value.select == '') {
+    return ElMessage.error('必须选择审批意见')
+  }
+  applyListClose()
+}
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
   })
 }
+// 选择标准装置完成之后
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
   <app-container>
-    <detail-page :title="`测量标准装置-${textMap[pageType]}`">
+    <detail-page :title="`证书报告 -- ${textMap[pageType]}`">
       <template #btns>
         <el-button
-          v-if="pageType !== 'detail'"
+          v-for="(item, index) in buttonArray"
+          :key="index"
           type="primary"
-          @click="submitForm()"
+          @click="getAddList(item, ruleFormRef)"
         >
-          提交
-        </el-button>
-        <el-button
-          v-else
-          v-print="printObj"
-          type="primary"
-        >
-          打印
+          {{ item }}
         </el-button>
         <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
+      <el-form
+        ref="ruleFormRef"
+        :model="formInline"
+        label-position="right"
+        label-width="auto"
+        :rules="rules"
+      >
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="检校专业:" prop="standardName">
+              <el-select
+                v-model="formInline.standardOwner"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择检校专业'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <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="出具日期:">
+              <el-date-picker
+                v-model="formInline.standardNo"
+                type="date"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择出具日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书编号:" prop="projectNo">
+              <el-input
+                v-model.trim="formInline.projectNo"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="constructionStandardProject">
+              <el-input
+                v-model.trim="formInline.constructionStandardProject"
+                :placeholder="pageType === 'detail' ? '' : '请输入证书报告名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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="pageType === 'detail' ? '' : '请选择组织机构代码'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item
+              label="电子签章:"
+              prop="constructionStandardUnitName"
+            >
+              <el-input
+                v-model.trim="formInline.constructionStandardUnitName"
+                :placeholder="pageType === 'detail' ? '' : '请选择电子签章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="认可标志专用章:" prop="standardOwner">
+              <el-input
+                v-model.trim="formInline.standardOwner"
+                :placeholder="pageType === 'detail' ? '' : '请选择认可标志专用章'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="10">
+            <el-form-item label="证书报告附件:" prop="contactInfo">
+              <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+              <span v-else-if="pageType === 'detail'">无</span>
+              <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
+              <el-button v-if="pageType !== 'detail'" id="file" 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="6">
+            <el-form-item label="原始记录编号:" prop="category">
+              <el-input
+                v-model.trim="formInline.category"
+                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                class="full-width-input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="检校地点:" prop="standardLevel">
+              <el-input
+                v-model.trim="formInline.standardLevel"
+                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="温度(℃):" prop="transmitRange">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="相对湿度(%):">
+              <el-input
+                v-model.trim="formInline.transmitRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="样品编号:" prop="preparationDate">
+              <el-input
+                v-model.trim="formInline.preparationDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="样品名称:" prop="standardLaboratory">
+              <el-input
+                v-model.trim="formInline.standardLaboratory"
+                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="出厂编号:" prop="laboratoryOwner">
+              <el-input
+                v-model.trim="formInline.laboratoryOwner"
+                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="型号:" prop="laboratoryOwnerContact">
+              <el-input
+                v-model.trim="formInline.laboratoryOwnerContact"
+                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="生产厂家:" prop="managerState">
+              <el-input
+                v-model.trim="formInline.managerState"
+                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方代码:" prop="measureMajor">
+              <el-input
+                v-model.trim="formInline.measureMajor"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方名称:" prop="assessmentUnit">
+              <el-input
+                v-model.trim="formInline.assessmentUnit"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="委托方电话:" prop="assessDate">
+              <el-input
+                v-model.trim="formInline.assessDate"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === '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"
+                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6">
+            <el-form-item label="送检人:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="联系方式:" prop="mesureRange">
+              <el-input
+                v-model.trim="formInline.mesureRange"
+                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计送达时间:" prop="authorityOfDate">
+              <el-date-picker
+                v-model="formInline.authorityOfDate"
+                type="datetime"
+                style="width: 100%;"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="预计检完时间:" prop="data">
+              <el-date-picker
+                v-model="formInline.data"
+                type="datetime"
+                style="width: 100%;"
+                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
+                format="YYYY-MM-DD hh:mm:ss"
+                clearable
+                value-format="YYYY-MM-DD h:m:s a"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检定项目:" prop="standardTemperature">
+              <el-input
+                v-model.trim="formInline.standardTemperature"
+                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </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"
+                :placeholder="pageType === 'detail' ? '' : '请输入备注'"
+                class="full-width-input"
+                clearable
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </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>
+    <detail-block title=" 所用设备">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
+          增加行
+        </el-button>
+        <el-button
+          v-if="pageType !== 'detail'"
+          type="info"
+          @click="removeRow('1')"
+        >
+          删除行
+        </el-button>
       </template>
-    </detail-block-switch>
-    <base-info id="form" ref="baseInfoRef" :info-id="infoId" :button-type="pageType" @setData="setData" />
+      <el-table
+        :data="fromListInfo.fixedAssetsList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="chooseList(scope.row, scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <detail-block title="所依据的技术文件">
+      <template v-if="pageType !== 'detail'" #btns>
+        <el-button type="primary" @click="addRow">
+          增加行
+        </el-button>
+        <el-button type="info" @click="removeRow('2')">
+          删除行
+        </el-button>
+      </template>
+      <el-table
+        :data="fromListInfo.fileList"
+        border
+        style="width: 100%;"
+        @selection-change="handleSelectionChange"
+      >
+        <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"
+          :key="item.value"
+          :prop="item.value"
+          :label="item.text"
+          align="center"
+        >
+          <template #header>
+            <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
+          </template>
+          <template
+            v-if="item.text === '文件编号' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template v-if="item.choose" #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </detail-block>
+    <div v-if="pageType === 'detail'">
+      <detail-block title="审批流程">
+        <!-- 审批流程 -->
+        <div>
+          <el-timeline>
+            <el-timeline-item
+              v-for="(activity, index) in approvalActivities"
+              :key="index"
+              :timestamp="activity.timestamp"
+            >
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
+            </el-timeline-item>
+          </el-timeline>
+        </div>
+      </detail-block>
+    </div>
   </app-container>
+  <!-- 审批弹窗信息收集 -->
+  <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </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 lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 007d8dc..5c3eb39 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -212,9 +212,9 @@
 }
 // 跳转到详情
 const goDetail = (row: ISupplier) => {
-  $router.push(`approve/${props.status}/${row.id}`)
+  $router.push(`/lab/reportOnCredentialsApproval/detail/${row.id}`)
 }
-// 新建溯源供方
+// 新建证书报告
 const add = () => {
   $router.push('/lab/reportOnCredentialsApproval/add')
 }
@@ -258,7 +258,7 @@
       approvalSubmit(row)
       break
     case '编辑':
-      $router.push(`/source/edit/${row.id}`)
+      $router.push(`/lab/reportOnCredentialsApproval/edit/${row.id}`)
       break
     case '同意':
       approvalDialog.value.initDialog('agree', row.taskId)
@@ -299,10 +299,10 @@
   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 if (checkoutList.value.length > 0) {
+  //   const printList = list.value.filter((item: ISupplier) => checkoutList.value.includes(item.id))
+  //   printJSON(printList, properties, '证书报告列表')
+  // }
   else {
     ElMessage.warning('无可打印内容')
   }
diff --git a/src/views/device/deviceMaintenance/components/checkList.vue b/src/views/device/deviceMaintenance/components/checkList.vue
index a9f3bf7..f3024cf 100644
--- a/src/views/device/deviceMaintenance/components/checkList.vue
+++ b/src/views/device/deviceMaintenance/components/checkList.vue
@@ -17,7 +17,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
@@ -101,7 +101,7 @@
     applyName: '',
     applyNo: '',
     applyPerson: '',
-    applyType: '7',
+    applyType: '8',
     applyUnit: '',
     businessKeys: [],
     createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listApproval.vue b/src/views/device/deviceMaintenance/components/listApproval.vue
index 8fec470..bd296f1 100644
--- a/src/views/device/deviceMaintenance/components/listApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listApproval.vue
@@ -37,7 +37,7 @@
   formId: SCHEDULE.DEVICE_FIX_ACCEPTANCE,
   applyName: '',
   applyNo: '',
-  applyType: '',
+  applyType: '9',
   businessKeys: [],
   checkApplyNo: '',
   checkEndDate: '',
diff --git a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
index 1666540..9c8bb99 100644
--- a/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listApprovalAdd.vue
@@ -30,10 +30,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -452,7 +452,7 @@
             <el-form-item label="验收单编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="验收单编号、自动生成"
+                :placeholder="pageType === 'detail' ? '' : '验收单编号、自动生成'"
                 disabled
               />
             </el-form-item>
@@ -461,7 +461,7 @@
             <el-form-item label="验收单名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="验收单名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入验收单名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -470,7 +470,7 @@
             <el-form-item label="检修申请编号:" prop="acceptanceCheckId">
               <el-input
                 v-model="checkIdObject.applyNo"
-                :placeholder="pageType === 'detail' ? '无' : '检修申请编号'"
+                :placeholder="pageType === 'detail' ? '无' : '请选择检修申请编号'"
                 :disabled="pageType === 'detail'"
               >
                 <template #append>
@@ -489,7 +489,7 @@
             <el-form-item label="检修申请名称:" prop="constructionStandardProject">
               <el-input
                 v-model.trim="checkIdObject.applyName"
-                placeholder="检修申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修申请名称'"
                 disabled
               />
             </el-form-item>
@@ -500,7 +500,7 @@
             <el-form-item label="检修保养人:" prop="overhaulPerson">
               <el-input
                 v-model.trim="formInline.overhaulPerson"
-                placeholder="检修保养人"
+                :placeholder="pageType === 'detail' ? '' : '请填写检修保养人'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -513,10 +513,10 @@
               <el-date-picker
                 v-model="formInline.time"
                 style="width: 100%;"
-                type="datetime"
-                placeholder="请选择检修日期"
-                format="YYYY/MM/DD HH:mm"
-                value-format="YYYY-MM-DD h:m"
+                type="date"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修日期'"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -527,7 +527,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -549,7 +549,7 @@
     </detail-page>
     <detail-block title="检修设备列表">
       <el-table
-        :data="formInline.equipmentList"
+        :data="formInline.equipmentList ? formInline.equipmentList : formInline.checkList"
         border
         style="width: 100%;"
       >
@@ -559,7 +559,7 @@
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
           <template #default="scope">
-            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :placeholder="`${item.text}`" class="input" />
+            <el-input v-if="item.text === '检修意见'" v-model="scope.row[item.value]" :disabled="pageType === 'detail'" :placeholder="`${item.text}`" class="input" />
             <el-select
               v-if="item.text === '检修结果'"
               v-model="scope.row[item.value]"
@@ -579,7 +579,7 @@
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
index 0fda7a8..37248bd 100644
--- a/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
+++ b/src/views/device/deviceMaintenance/components/listMaintenanceApproval.vue
@@ -38,7 +38,7 @@
   applyName: '',
   applyNo: '',
   applyPerson: '',
-  applyType: '7',
+  applyType: '8',
   applyUnit: '',
   businessKeys: [],
   createUser: '',
diff --git a/src/views/device/deviceMaintenance/components/listPageAdd.vue b/src/views/device/deviceMaintenance/components/listPageAdd.vue
index 4e2432f..9f04b8b 100644
--- a/src/views/device/deviceMaintenance/components/listPageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/listPageAdd.vue
@@ -35,10 +35,10 @@
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   else {
-    buttonArray.value = ['保存', '提交']
+    buttonArray.value = ['提交', '保存']
   }
   if ($route.params.id) {
     infoId.value = $route.params.id as string
@@ -55,7 +55,7 @@
   applyNo: '',
   applyPerson: '',
   applyPersonName: '',
-  applyType: '7',
+  applyType: '8',
   applyTypeName: '',
   applyUnit: '',
   applyUnitName: '',
@@ -65,19 +65,6 @@
   createUser: '',
   equipmentInfoList: [],
   equipmentList: [],
-  fileList: [
-    {
-      applyId: null,
-      createTime: '',
-      createUser: null,
-      fileName: '',
-      id: null,
-      isDel: null,
-      minioFileName: '',
-      remark: '',
-      updateTime: '',
-    },
-  ],
   id: null,
   isDel: null,
   overhaulPerson: '',
@@ -372,7 +359,12 @@
 // 点击增加行
 const addRoow = () => {
   // list.value.push(JSON.parse(JSON.stringify(addList.value)))
-  addRowRef.value.initDialog({ title: '' })
+  if (formInline.value.equipmentList.length >= 1 && formInline.value.equipmentList[formInline.value.equipmentList.length - 1].equipmentId === '') {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    addRowRef.value.initDialog({ title: '' })
+  }
 }
 
 // 标准配套设备更换表格删除行
@@ -460,7 +452,7 @@
             <el-form-item label="申请编号:">
               <el-input
                 v-model.trim="formInline.applyNo"
-                placeholder="申请编号"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请编号'"
                 disabled
               />
             </el-form-item>
@@ -469,7 +461,7 @@
             <el-form-item label="申请名称:" prop="applyName">
               <el-input
                 v-model.trim="formInline.applyName"
-                placeholder="申请名称"
+                :placeholder="pageType === 'detail' ? '' : '请输入申请名称'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -479,7 +471,7 @@
               <dept-select
                 v-model="formInline.applyUnit"
                 :data="useDeptList"
-                :placeholder="pageType === 'detail' ? '' : '申请单位'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请单位'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -488,7 +480,7 @@
             <el-form-item label="申请人:" prop="applyPerson">
               <el-select
                 v-model="formInline.applyPerson"
-                :placeholder="pageType === 'detail' ? '' : '申请人'"
+                :placeholder="pageType === 'detail' ? '' : '请选择申请人'"
                 :disabled="pageType === 'detail'"
                 style="width: 100%;"
               >
@@ -509,7 +501,7 @@
                 v-model="formInline.time"
                 type="datetime"
                 style="width: 100%;"
-                placeholder="请选择检修时间"
+                :placeholder="pageType === 'detail' ? '' : '请选择检修时间'"
                 format="YYYY/MM/DD HH:mm"
                 value-format="YYYY-MM-DD h:m"
                 :disabled="pageType === 'detail'"
@@ -522,7 +514,7 @@
             <el-form-item label="备注:">
               <el-input
                 v-model.trim="formInline.remark"
-                placeholder="备注"
+                :placeholder="pageType === 'detail' ? '' : '请填写备注'"
                 :disabled="pageType === 'detail'"
               />
             </el-form-item>
@@ -561,29 +553,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template #default="scope">
-            <el-input
-              v-if="item.text !== '有效日期'"
-              v-model="scope.row[item.value]"
-              :placeholder="pageType === 'detail' ? '' : `${item.text}`"
-              :disabled="pageType === 'detail'"
-              class="input"
-            />
-            <el-date-picker
-              v-else
-              v-model="scope.row[item.value]"
-              type="datetime"
-              placeholder="请选择考核日期"
-              style="width: 100%;"
-              format="YYYY/MM/DD HH:mm:ss"
-              value-format="YYYY-MM-DD h:m:s"
-              :disabled="pageType === 'detail'"
-            />
-          </template>
         </el-table-column>
       </el-table>
     </detail-block>
-    <detail-block v-if="pageType !== 'add'" title="审批流程">
+    <detail-block v-if="pageType === 'detail'" title="审批流程">
       <!-- 审批流程 -->
       <div>
         <el-timeline>
diff --git a/src/views/device/deviceMaintenance/components/manageAdd.vue b/src/views/device/deviceMaintenance/components/manageAdd.vue
index 6f1ff1a..0557531 100644
--- a/src/views/device/deviceMaintenance/components/manageAdd.vue
+++ b/src/views/device/deviceMaintenance/components/manageAdd.vue
@@ -198,7 +198,7 @@
               <el-form-item label="检查表名称:" prop="checkName">
                 <el-input
                   v-model="formInline.checkName"
-                  :placeholder="pageType === 'detail' ? '' : '检查表名称'"
+                  :placeholder="pageType === 'detail' ? '' : '请输入检查表名称'"
                   :class="{ 'detail-input': pageType === 'detail' }"
                   :disabled="pageType === 'detail'"
                 />
@@ -218,11 +218,11 @@
               <el-form-item label="检查日期:" prop="checkDate">
                 <el-date-picker
                   v-model="formInline.checkDate"
-                  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="pageType === 'detail'"
                 />
               </el-form-item>
@@ -256,7 +256,7 @@
                 <el-select
                   v-model.trim="formInline.checkResult"
                   clearable
-                  placeholder="计量专业"
+                  :placeholder="pageType === 'detail' ? '' : '请选择计量专业'"
                   size="default"
                   :disabled="pageType === 'detail'"
                   style="width: 100%;"
diff --git a/src/views/device/deviceMaintenance/maintenanceCheckList.vue b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
index ce6000d..eec1035 100644
--- a/src/views/device/deviceMaintenance/maintenanceCheckList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceCheckList.vue
@@ -76,6 +76,16 @@
     currentTab.value = currentMenu?.name
   }
 }
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceCheckListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceCheckListMenu') || '全部'
+  sessionStorage.getItem('maintenceCheckListMenu') ? sessionStorage.removeItem('maintenceCheckListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/deviceMaintenance/maintenanceList.vue b/src/views/device/deviceMaintenance/maintenanceList.vue
index aecaa95..56c7c1b 100644
--- a/src/views/device/deviceMaintenance/maintenanceList.vue
+++ b/src/views/device/deviceMaintenance/maintenanceList.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('maintenceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('maintenceListMenu') || '全部'
+  sessionStorage.getItem('maintenceListMenu') ? sessionStorage.removeItem('maintenceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/device/standardEquipment/components/listApply/listPage.vue b/src/views/device/standardEquipment/components/listApply/listPage.vue
index cf3712f..6f7bf0b 100644
--- a/src/views/device/standardEquipment/components/listApply/listPage.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPage.vue
@@ -6,7 +6,7 @@
 import ListSourceAdd from './listPageAdd.vue'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
-import { getExportList, getStandardLisdelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
+import { getExportList, getOperateDelete, getUsersDept, getstandardEquipmentApplyList, submitStandardEquipmentApply } from '@/api/device/standard'
 import { uploadApi } from '@/api/system/notice'
 import { printJSON } from '@/utils/printUtils'
 import { exportFile } from '@/utils/exportUtils'
@@ -145,7 +145,7 @@
   meterMajor: '',
   organizeName: '',
   organizeNo: '',
-  organizeType: '2',
+  organizeType: '3',
   pdeptId: null,
   offset: 1,
   limit: 999999,
@@ -191,7 +191,7 @@
     },
   )
     .then(() => {
-      getStandardLisdelete({ id: row.id as string }).then((res) => {
+      getOperateDelete({ id: row.id as string, taskId: row.taskId }).then((res) => {
         if (res.code === 200) {
           ElMessage({
             type: 'success',
@@ -209,7 +209,11 @@
     name: 'standardListAdd',
     params: {
       type: 'detail',
+    },
+    query: {
+      title: '详情',
       id: row.id,
+      applyType: props.applyType,
       formId: props.schedule,
     },
   })
@@ -271,7 +275,11 @@
         name: 'standardListAdd',
         params: {
           type: 'edit',
+        },
+        query: {
+          title: '编辑',
           id: row.id,
+          applyType: props.applyType,
           formId: props.schedule,
         },
       })
diff --git a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
index 9832687..c2fca9d 100644
--- a/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
+++ b/src/views/device/standardEquipment/components/listApply/listPageAdd.vue
@@ -2,13 +2,23 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
+import EquipmentDialog from '../standardList/equipmentDialog.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'
-import { getStandardLisAdd, getStandardList, getStandardListDetail, getUsersDept, submitStandardEquipmentApply, updateStandardEquipmentApply } from '@/api/device/standard'
+import {
+  getStandardLisAdd,
+  getStandardLisdetali,
+  getStandardListDetail,
+  getUsersDept,
+  submitStandardEquipmentApply,
+  updateStandardEquipmentApply,
+} from '@/api/device/standard'
 import { UploadFile } from '@/api/measure/file'
 import useUserStore from '@/store/modules/user'
+import showPhoto from '@/views/system/tool/showPhoto.vue'
 import { submitApproval } from '@/api/approval'
 const loading = ref(false) // 表单加载状态
 const infoId = ref('') // id
@@ -26,18 +36,18 @@
 const { username } = useUserStore()
 if ($route.params && $route.params.type) {
   pageType.value = $route.params.type as string
-  formId.value = $route.params.formId as string
+  formId.value = $route.query.formId as string
   if (pageType.value === 'add') {
     buttonArray.value = ['提交', '保存']
   }
   else if (pageType.value === 'edit') {
-    buttonArray.value = ['提交']
+    buttonArray.value = ['保存']
   }
   else {
     buttonArray.value = ['同意', '驳回', '拒绝']
   }
-  if ($route.params.id) {
-    infoId.value = $route.params.id as string
+  if ($route.query.id) {
+    infoId.value = $route.query.id as string
   }
 }
 const ruleFormRef = ref<FormInstance>()
@@ -87,18 +97,19 @@
 
 const fromListInfo = ref({
   applyDept: '',
-  applyEquipmentList: [],
   applyNo: '',
   applyType: $route.query.applyType,
   applyTypeName: '',
   approvalStatus: '',
+  applyEquipmentList: [],
+  fixedAssetsList: [],
   approvalStatusName: '',
   constructionStandardUnitName: '',
   createTime: null,
   createUser: null,
   fileList: [],
   id: null,
-  isDel: 0,
+  isDel: '',
   processId: '',
   remark: '',
   standardEquipmentId: '',
@@ -185,8 +196,7 @@
   })
 }
 // 数据
-const list = ref<object[]>([
-])
+const list = ref<object[]>([])
 // 标准配套设备更换表格总数
 const total = ref(0)
 // 审批弹窗开关
@@ -214,13 +224,12 @@
   choose: Boolean
   time: Boolean
 }
-// 申请文档列表
-const filesList = ref([])
+
 // 标准配套设备更换表头
 const columns = ref<columnsType[]>([
   {
     text: '设备名称',
-    value: 'assetTypeName',
+    value: 'equipmentName',
     align: 'center',
     required: true,
     choose: true,
@@ -228,7 +237,7 @@
   },
   {
     text: '设备编号',
-    value: 'assetNo',
+    value: 'equipmentNo',
     align: 'center',
     required: true,
     choose: false,
@@ -244,7 +253,7 @@
   },
   {
     text: '测量范围',
-    value: 'assetTypeName',
+    value: 'mesureRange',
     align: 'center',
     required: true,
     choose: false,
@@ -252,7 +261,7 @@
   },
   {
     text: '使用部门',
-    value: 'purpose',
+    value: 'useDept',
     align: 'center',
     required: true,
     choose: false,
@@ -260,7 +269,7 @@
   },
   {
     text: '检定时间',
-    value: 'manufacturingDate',
+    value: 'mesureDate',
     align: 'center',
     required: true,
     choose: false,
@@ -268,7 +277,7 @@
   },
   {
     text: '检定结果',
-    value: 'managerStateName',
+    value: 'mesureResult',
     align: 'center',
     required: true,
     choose: false,
@@ -276,7 +285,7 @@
   },
   {
     text: '有效日期',
-    value: 'mesureCycleName',
+    value: 'validDate',
     align: 'center',
     required: true,
     choose: false,
@@ -347,109 +356,147 @@
   $router.back()
 }
 const rules = ref({
-  standardName: [{ required: true, message: '标准名称不能为空', trigger: 'blur' }],
+  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' }],
+  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' }],
+  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 fetchData = () => {
-  const params = {
-    standardNo: '',
-    standardName: '',
-    category: '',
-    managerState: null,
-    standardLaboratory: null,
-    preparationDate: null,
-    id: null,
-    offset: 1,
-    limit: 1000000,
-  }
-  getStandardList(params).then((response) => {
-    standardList.value = response.data.rows
-  })
+// 第几条数据选择
+const listIndex = ref(0)
+
+const uploadIndex = (row) => {
+  listIndex.value = row.$index
 }
-fetchData()
 // 上传请求
 const uploadQuarterlyEvaluateFile = (file: any) => {
   const fd = new FormData()
   fd.append('multipartFile', file.file)
   UploadFile(fd).then((res) => {
     if (res.code === 200) {
-      fromListInfo.value.fileList[0].minioFileName = res.data[0]
+      fromListInfo.value.fileList[listIndex.value].minioFileName = res.data[0]
       // 重置当前验证
       ElMessage.success('文件上传成功')
+      fromListInfo.value.fileList[listIndex.value].choose = true
     }
   })
 }
-const handleExceed: UploadProps['onExceed'] = (files, uploadFiles) => {
-  ElMessage.warning('只能上传一个文件')
-}
-// 移除时触发
-const beforeRemove: UploadProps['beforeRemove'] = (uploadFile, uploadFiles) => {
-  return ElMessageBox.confirm(
-    `确认移除${uploadFile.name}文件吗 ?`,
-  ).then(
-    () => true,
-    () => false,
-
-  )
-}
 // 选择标准配套设备
-const userListDialog = ref()
-// 第几条数据选择
-const listIndex = ref(0)
+const equipmentDialog = ref()
 // 点击标准配套设备选择按钮
 const chooseList = (row: object, index: number) => {
   listIndex.value = index
-  userListDialog.value.initDialog()
+  equipmentDialog.value.initDialog()
 }
-// 选择完成之后的回调
-const confirmPerson = (row: any) => {
-  fromListInfo.value.applyEquipmentList[listIndex.value] = row[0]
-  console.log(fromListInfo.value)
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
+// 点击增加行
+const addRoow = () => {
+  if (
+    fromListInfo.value.applyEquipmentList.length >= 1
+    && fromListInfo.value.applyEquipmentList[
+      fromListInfo.value.applyEquipmentList.length - 1
+    ].equipmentId === ''
+  ) {
+    ElMessage.warning('请完善上一条设备信息')
+  }
+  else {
+    fromListInfo.value.applyEquipmentList.push({
+      equipmentId: '',
+      standardApplyId: '',
+    })
+    fromListInfo.value.fixedAssetsList.push({})
+  }
+}
+// 选择设备之后
+const equipmentAddRow = (data: object) => {
+  fromListInfo.value.fixedAssetsList[listIndex.value] = data
+  fromListInfo.value.applyEquipmentList[listIndex.value].equipmentId = data.id
+  fromListInfo.value.applyEquipmentList[listIndex.value].standardApplyId
+    = infoId.value || ''
 }
 // 增加申请文档列表
 const addRow = () => {
-  fromListInfo.value.fileList.push({})
+  if (
+    fromListInfo.value.fileList.length >= 1
+    && !fromListInfo.value.fileList[fromListInfo.value.fileList.length - 1]
+      .fileName
+  ) {
+    ElMessage.warning('请完善上一条文件信息')
+  }
+  else {
+    fromListInfo.value.fileList.push({ choose: false })
+  }
 }
 // 点击文件预览
 const uploadShow = (e: any) => {
   const URL = window.URL || window.webkitURL
   window.open(URL.createObjectURL(e.raw))
 }
-const testForm = ref({
-  fileList: [],
-  fileContent: '',
-})
-const handleFileChange = (files: any, fileList: any) => {
-  testForm.value.fileList = fileList
-  const reader = new FileReader()
-  reader.readAsText(files.raw)
-  // reader.onload = (e) => {
-  //   testForm.value.fileContent = e.target!.result?.replace(
-  //     /\n|\r\n/g,
-  //     '<br/>',
-  //   )
-  // }
-}
+
 // 表格选中的数组
 const SelectionList = ref<object[]>([])
 // 标准实验室发生改变row类型
@@ -461,25 +508,24 @@
   id: string
 }
 // 标准实验室发生改变
-const changeDeptList = (row: rowReturn) => {
-  formInline.value.laboratoryOwnerContact = row.phone
-  formInline.value.laboratoryOwner = row.director
-}
+const changeDeptList = (row: rowReturn) => {}
 // 标准实验室清空时
-const clearDeptList = () => {
-  formInline.value.laboratoryOwnerContact = ''
-  formInline.value.laboratoryOwner = ''
-}
+const clearDeptList = () => {}
 // 获取详情信息
 const getInfo = (id: string | number) => {
-  getStandardListDetail({ id }).then((res) => {
+  getStandardLisdetali({ id }).then((res) => {
     Object.keys(res.data).map((item) => {
-      if (typeof (res.data[item]) === 'number') {
+      if (typeof res.data[item] === 'number') {
         res.data[item] = res.data[item].toString()
       }
     })
-    formInline.value = res.data
-    formInline.value.standardEquipmentId = res.data.id
+    formInline.value = res.data.meterStandardEquipment
+    fromListInfo.value.standardEquipmentId = res.data.id
+    fromListInfo.value.fixedAssetsList = res.data.fixedAssetsList
+    fromListInfo.value.fileList = res.data.fileList.map((item) => {
+      item.choose = true
+      return item
+    })
   })
 }
 if (pageType.value !== 'add') {
@@ -492,23 +538,18 @@
     taskId: fromListInfo.value.taskId!,
     comments: '',
   }
-  ElMessageBox.confirm(
-    '确认取消该审批吗？',
-    '提示',
-    {
-      confirmButtonText: '确认',
-      cancelButtonText: '取消',
-      type: 'warning',
-    },
-  )
-    .then(() => {
-      submitApproval('revoke', params).then((res) => {
-        ElMessage({
-          type: 'success',
-          message: '取消成功',
-        })
+  ElMessageBox.confirm('确认取消该审批吗？', '提示', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(() => {
+    submitApproval('revoke', params).then((res) => {
+      ElMessage({
+        type: 'success',
+        message: '取消成功',
       })
     })
+  })
 }
 // 点击数据后的操作按钮
 const clickBtn = (buttonType: string) => {
@@ -532,19 +573,17 @@
 // 点击顶部一排按钮
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
   if (item === '保存' && pageType.value === 'add') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          getStandardLisAdd(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          getStandardLisAdd(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -555,19 +594,17 @@
     })
   }
   else if (item === '保存' && pageType.value === 'edit') {
-    if (!formEl) { return }
+    if (!formEl) {
+      return
+    }
     await formEl.validate((valid, fields) => {
       if (valid) {
-        ElMessageBox.confirm(
-          '确认保存吗？',
-          '提示',
-          {
-            confirmButtonText: '确认',
-            cancelButtonText: '取消',
-            type: 'warning',
-          },
-        ).then(() => {
-          updateStandardEquipmentApply(formInline.value).then((res) => {
+        ElMessageBox.confirm('确认保存吗？', '提示', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then(() => {
+          updateStandardEquipmentApply(fromListInfo.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -582,7 +619,10 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({ id: addId.value, formId: formId.value }).then((res) => {
+      submitStandardEquipmentApply({
+        id: addId.value,
+        formId: formId.value,
+      }).then((res) => {
         if (res.code === 200) {
           close()
         }
@@ -613,21 +653,14 @@
   },
 ]
 // 审批完成后的回调
-const approvalSuccess = () => {
-
-}
+const approvalSuccess = () => {}
 // 选择标准装置弹窗ref
 const standarDialog = ref()
 // 选择了标准名称后
-const standardChange = (e: any) => {
-  // getInfo(e)
-  // formInline.value.standardOwner = e
+const standardChange = () => {
   standarDialog.value.initDialog()
 }
-// 点击增加行
-const addRoow = () => {
-  fromListInfo.value.applyEquipmentList.push({})
-}
+
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
@@ -635,27 +668,25 @@
 // 标准配套设备更换表格删除行
 const removeRow = (type: string) => {
   if (SelectionList.value.length > 0) {
-    ElMessageBox.confirm(
-      '确认删除选中的数据吗？',
-      '提示',
-      {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      },
-    ).then(() => {
+    ElMessageBox.confirm('确认删除选中的数据吗？', '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
       if (type == '1') {
-      // 删除行
-        list.value = list.value.filter((item) => {
+        // 删除行
+        fromListInfo.value.fixedAssetsList = fromListInfo.value.fixedAssetsList.filter((item) => {
           return !SelectionList.value.includes(item)
         })
         ElMessage.success('删除成功')
       }
       else {
-      // 删除行
-        fromListInfo.value.fileList = fromListInfo.value.fileList.filter((item) => {
-          return !SelectionList.value.includes(item)
-        })
+        // 删除行
+        fromListInfo.value.fileList = fromListInfo.value.fileList.filter(
+          (item) => {
+            return !SelectionList.value.includes(item)
+          },
+        )
         ElMessage.success('删除成功')
       }
     })
@@ -668,10 +699,13 @@
 const handleSelectionChange = (e: any) => {
   SelectionList.value = e
 }
-watch(() => formInline.value, (newVal) => {
-// 变化后存储
-},
-{ deep: true, immediate: true })
+watch(
+  () => formInline.value,
+  (newVal) => {
+    // 变化后存储
+  },
+  { deep: true, immediate: true },
+)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -684,8 +718,26 @@
   }
   applyListClose()
 }
+// 标准装置发生改变data类型
+interface dataReturn {
+  id: string
+}
+// 获取详情信息
+const getStandarInfo = (id: string | number) => {
+  getStandardListDetail({ id }).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
+    fromListInfo.value.standardEquipmentId = res.data.id
+  })
+}
 // 选择标准装置完成之后
-const StandarAddRow = (data: object) => {}
+const StandarAddRow = (data: dataReturn) => {
+  getStandarInfo(data.id)
+}
 </script>
 
 <template>
@@ -714,9 +766,18 @@
         <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-input
+                v-model="formInline.standardName"
+                :placeholder="pageType === 'detail' ? '' : '请选择标准装置名称'"
+                class="input"
+                :disabled="pageType === 'detail'"
+              >
+                <template v-if="pageType !== 'detail'" #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="standardChange"
+                  >
                     选择
                   </el-button>
                 </template>
@@ -1024,7 +1085,7 @@
             <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="pageType === 'detail' ? '' : '标准温度℃'"
@@ -1034,7 +1095,7 @@
             </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="pageType === 'detail' ? '' : '标准湿度%'"
@@ -1044,13 +1105,13 @@
             </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
-                type="datetime"
+                v-model="simulateObject.data"
+                type="date"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '有效日期'"
                 format="YYYY-MM-DD"
                 value-format="YYYY-MM-DD"
                 disabled
@@ -1059,35 +1120,25 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="pageType === '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-input v-model.trim="simulateObject.certificateNo" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证单位:">
-              <el-input placeholder="发证单位" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
+                v-model="simulateObject.authorityOfDate"
                 type="date"
-                :placeholder="pageType === 'detail' ? '' : '发证日期'"
-                format="YYYY/MM/DD"
-                value-format="YYYY-MM-DD"
                 style="width: 100%;"
+                format="YYYY-MM-DD"
+                value-format="YYYY-MM-DD"
                 disabled
               />
             </el-form-item>
@@ -1109,11 +1160,7 @@
     </detail-page>
     <detail-block title="标准配套设备更换">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="primary"
-          @click="addRoow"
-        >
+        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
         <el-button
@@ -1125,12 +1172,16 @@
         </el-button>
       </template>
       <el-table
-        :data="fromListInfo.applyEquipmentList"
+        :data="fromListInfo.fixedAssetsList"
         border
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1142,7 +1193,10 @@
           <template #header>
             <span v-show="item.required" style="color: red;">*</span><span>{{ item.text }}</span>
           </template>
-          <template v-if="item.text === '设备名称'" #default="scope">
+          <template
+            v-if="item.text === '设备名称' && pageType !== 'detail'"
+            #default="scope"
+          >
             <el-input
               v-model="scope.row[item.value]"
               :placeholder="`${item.text}`"
@@ -1164,14 +1218,10 @@
     </detail-block>
     <detail-block title="申请文档">
       <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addRow">
+        <el-button type="primary" @click="addRow">
           增加行
         </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="removeRow('2')"
-        >
+        <el-button type="info" @click="removeRow('2')">
           删除行
         </el-button>
       </template>
@@ -1181,7 +1231,11 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column v-if="pageType !== 'detail'" 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"
@@ -1195,33 +1249,35 @@
           </template>
           <template #default="scope">
             <el-date-picker
-              v-if="item.time"
+              v-if="item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
-              type="date"
-              placeholder="请选择发证日期"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              type="datetime"
+              placeholder="请选择上传时间"
+              format="YYYY-MM-DD hh:mm:ss"
+              value-format="YYYY-MM-DD h:m:s"
+            />
+            <show-photo
+              v-else-if="
+                scope.row.choose && scope.row.minioFileName && item.choose
+              "
+              :minio-file-name="scope.row.minioFileName"
             />
             <el-input
-              v-else
+              v-else-if="!item.time && pageType !== 'detail'"
               v-model="scope.row[item.value]"
               :autofocus="true"
               style="height: 5vh;"
               :placeholder="`${item.text}`"
-              class="input"
             >
-              <template v-if="item.choose" #append>
+              <template v-if="!scope.row.minioFileName && item.choose" #append>
                 <el-upload
                   v-model:file-list="fileList"
-                  enctype="multipart/form-data"
                   :http-request="uploadQuarterlyEvaluateFile"
-                  :before-remove="beforeRemove"
-                  :on-exceed="handleExceed"
-                  :on-preview="uploadShow"
-                  :on-change="handleFileChange"
-                  :limit="1"
                 >
-                  <el-button :disabled="pageType === 'detail'" style="line-height: 2.5;">
+                  <el-button
+                    v-if="pageType !== 'detail'"
+                    @click="uploadIndex(scope)"
+                  >
                     上传
                   </el-button>
                 </el-upload>
@@ -1241,7 +1297,10 @@
               :key="index"
               :timestamp="activity.timestamp"
             >
-              <div><span>审批人：</span>{{ activity.name }} <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}</div>
+              <div>
+                <span>审批人：</span>{{ activity.name }}
+                <span style="margin-left: 10px;">审批意见：</span>{{ activity.content }}
+              </div>
             </el-timeline-item>
           </el-timeline>
         </div>
@@ -1252,10 +1311,12 @@
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
   <!-- 选择标准装置弹窗 -->
   <standar-dialog ref="standarDialog" @add="StandarAddRow" />
+  <!-- 选择设备弹窗 -->
+  <equipment-dialog ref="equipmentDialog" @add="equipmentAddRow" />
 </template>
 
-<style lang="scss" scoped>
-:deep .el-input .el-input--default .el-input--suffix {
-  width: 200px !important;
+<style lang="scss">
+.el-upload-list {
+  display: none !important;
 }
 </style>
diff --git a/src/views/device/standardEquipment/components/standardList/baseInfo.vue b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
index 07b439b..f8fd6a9 100644
--- a/src/views/device/standardEquipment/components/standardList/baseInfo.vue
+++ b/src/views/device/standardEquipment/components/standardList/baseInfo.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance, UploadProps, UploadUserFile } from 'element-plus'
+import dayjs from 'dayjs'
 import type { IOptions } from '../../standard_interface'
 import laboratoryDialog from './laboratoryDialog.vue'
 import { getStaffList } from '@/api/measure/person'
@@ -167,6 +168,7 @@
   name: string
   organizeName: string
   id: string
+  deptId: string
 }
 // 实验室ref
 const laboratorydialog = ref()
@@ -199,6 +201,13 @@
 const personClick = () => {
   personListdialog.value.initDialog()
 }
+// 测试数据
+const simulateObject = {
+  data: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 有效日期
+  certificateNo: '199926465422', // 证书编号
+  authorityOfIssue: 'xxx公司', // 发证单位
+  authorityOfDate: dayjs(`${new Date()}`).format('YYYY.MM.DD'), // 发证日期
+}
 // 选择负责人回调函数
 const personListAdd = (data: rowReturn) => {
   formInline.value.standardOwner = data.id
@@ -206,7 +215,7 @@
 }
 // 选择完科室的回调函数
 const laboratoryListAdd = (data: rowReturn) => {
-  formInline.value.standardLaboratory = data.id
+  formInline.value.standardLaboratory = data.deptId
   formInline.value.standardLaboratoryName = data.organizeName
   formInline.value.laboratoryOwner = data.director
   formInline.value.laboratoryOwnerContact = data.phone
@@ -227,6 +236,7 @@
   <app-container>
     <div class="info-content">
       <el-form
+        id="form"
         ref="ruleFormRef"
         :model="formInline"
         label-position="right"
@@ -587,46 +597,39 @@
           <el-col :span="6">
             <el-form-item label="有效日期:">
               <el-date-picker
-                type="datetime"
+                v-model="simulateObject.data"
+                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
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="证书编号:">
-              <el-select
-                clearable
-                :placeholder="buttonType === 'detail' ? '' : '请选择证书编号'"
-                size="default"
-                style="width: 100%;"
+              <el-input
+                v-model.trim="simulateObject.certificateNo"
                 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="buttonType === 'detail' ? '' : '请输入发证单位'" disabled class="full-width-input" />
+              <el-input
+                v-model.trim="simulateObject.authorityOfIssue"
+                disabled
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="发证日期:">
               <el-date-picker
-                type="datetime"
-                :placeholder="buttonType === 'detail' ? '' : '请选择发证日期'"
+                v-model="simulateObject.authorityOfDate"
+                type="date"
                 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>
diff --git a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
index 6453565..6bda8e3 100644
--- a/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
+++ b/src/views/device/standardEquipment/components/standardList/verificationDialog.vue
@@ -29,22 +29,11 @@
 const total = ref<number>(0)
 const select = ref<number>(-1)
 const columns = [
-  {
-    text: '设备名称',
-    value: 'equipmentName',
-  },
-  {
-    text: '设备编号',
-    value: 'equipmentNo',
-  },
-  {
-    text: '型号',
-    value: 'manufacturer',
-  },
-  {
-    text: '管理状态',
-    value: 'managerStateName',
-  }]
+  { text: '文件名称', value: 'fileName' },
+  { text: '文件编号', value: 'fileNo' },
+  { text: '文件号', value: 'fileCode', align: 'center' },
+  { text: '实施时间', value: 'effectiveTime', align: 'center', width: '180' },
+  { text: '实施状态', value: 'effectiveStatusName', align: 'center', width: '100' }]
 
 // 获取数据列表
 const fetchData = () => {
diff --git a/src/views/device/standardEquipment/components/standardListAdd.vue b/src/views/device/standardEquipment/components/standardListAdd.vue
index ff45abc..59f7d87 100644
--- a/src/views/device/standardEquipment/components/standardListAdd.vue
+++ b/src/views/device/standardEquipment/components/standardListAdd.vue
@@ -243,17 +243,32 @@
 const listIndex = ref(0)
 // 新增计量人员
 const measurementPersonnelAddRow = () => {
-  measurementPersonnel.value.push({})
+  if (measurementPersonnel.value.length >= 1 && !measurementPersonnel.value[measurementPersonnel.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条计量人员信息')
+  }
+  else {
+    measurementPersonnel.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增标准配套设备
 const corollaryEquipmentAddRow = () => {
-  corollaryEquipment.value.push({})
+  if (corollaryEquipment.value.length >= 1 && !corollaryEquipment.value[corollaryEquipment.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条配套设备信息')
+  }
+  else {
+    corollaryEquipment.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 新增检定规程
 const regulationVerificationAddRow = () => {
-  regulationVerification.value.push({})
+  if (regulationVerification.value.length >= 1 && !regulationVerification.value[regulationVerification.value.length - 1].name) {
+    ElMessage.warning('请先完善上一条检定规程信息')
+  }
+  else {
+    regulationVerification.value.push({})
+  }
   // ElMessage.warning('请先选择上一条信息')
 }
 // 设备ref
@@ -350,6 +365,7 @@
     measurementPersonnel.value[listIndex.value] = object
     measurementPersonnel.value[listIndex.value].standardEquipmentId = infoId.value
     measurementPersonnel.value[listIndex.value].userId = object.id
+    delete object.id
     setBatchAdd(measurementPersonnel.value).then((res) => {})
   }
   else {
@@ -364,6 +380,7 @@
     corollaryEquipment.value[listIndex.value].standardEquipmentId = infoId.value
     corollaryEquipment.value[listIndex.value].equipmentId = data.id
     corollaryEquipment.value[listIndex.value].name = data.equipmentName
+    delete data.id
     getEquipmenteAdd(corollaryEquipment.value[listIndex.value]).then((res) => {})
   }
   else {
@@ -378,6 +395,7 @@
     regulationVerification.value[listIndex.value].standardEquipmentId = infoId.value
     regulationVerification.value[listIndex.value].verifyRegulationId = data.id
     regulationVerification.value[listIndex.value].name = data.fileName
+    delete data.id
     getRegulationAdd(regulationVerification.value[listIndex.value]).then((res) => {})
   }
   else {
diff --git a/src/views/measure/source/approve.vue b/src/views/measure/source/approve.vue
index 61e887a..44861c9 100644
--- a/src/views/measure/source/approve.vue
+++ b/src/views/measure/source/approve.vue
@@ -75,6 +75,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('sourceListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('sourceListMenu') || '全部'
+  sessionStorage.getItem('sourceListMenu') ? sessionStorage.removeItem('sourceListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]
diff --git a/src/views/measure/source/components/baseInfoDetail.vue b/src/views/measure/source/components/baseInfoDetail.vue
index 221bdca..2c5c2ff 100644
--- a/src/views/measure/source/components/baseInfoDetail.vue
+++ b/src/views/measure/source/components/baseInfoDetail.vue
@@ -200,7 +200,7 @@
         </el-form-item>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="公司业务范围:">
             <el-input
               v-model="formData.businessScope"
@@ -212,7 +212,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="24">
-        <el-col :span="14">
+        <el-col :span="12">
           <el-form-item label="备注:">
             <el-input
               v-model="formData.remark"
diff --git a/src/views/measure/source/listAdd.vue b/src/views/measure/source/listAdd.vue
index 779821b..e388775 100644
--- a/src/views/measure/source/listAdd.vue
+++ b/src/views/measure/source/listAdd.vue
@@ -533,7 +533,7 @@
             </el-form-item>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="公司业务范围:">
                 <el-input
                   v-model="formInline.businessScope"
@@ -545,7 +545,7 @@
             </el-col>
           </el-row>
           <el-row :gutter="24">
-            <el-col :span="14">
+            <el-col :span="12">
               <el-form-item label="备注:">
                 <el-input
                   v-model="formInline.remark"
@@ -559,7 +559,7 @@
           <el-row :gutter="24" class="marg">
             <el-col :span="14">
               <el-form-item label="附件:">
-                <show-photo v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
+                <show- v-if="formInline.minioFileName" :minio-file-name="formInline.minioFileName" />
                 <span v-else-if="pageType === 'detail'">无</span>
                 <input v-show="pageType === ''" ref="fileRef" type="file" @change="onFileChange">
                 <el-button v-if="pageType !== 'detail'" id="file" type="primary" :disabled="pageType === 'detail'" :style="{ 'margin-left': formInline.minioFileName === '' ? '0px' : '20px' }" @click="upload">
diff --git a/src/views/measure/train/components/planListDialog.vue b/src/views/measure/train/components/planListDialog.vue
new file mode 100644
index 0000000..0703ad2
--- /dev/null
+++ b/src/views/measure/train/components/planListDialog.vue
@@ -0,0 +1,205 @@
+<!-- 用户列表弹窗 -->
+<script lang="ts" setup name="selectPerson">
+import { ElMessage } from 'element-plus'
+import type { IOptions } from '../plan_interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getDeptTree, getPlanList } from '@/api/system/plan'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+})
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false)
+
+// 查询条件
+const listQuery = ref({
+  createEndTime: '',
+  createStartTime: '',
+  deptId: '',
+  director: '',
+  effectiveCompany: '',
+  ids: [],
+  trainEndTime: '',
+  formId: SCHEDULE.TRAIN_APPROVAL,
+  trainStartTime: '',
+  offset: 1,
+  limit: 20,
+})
+// 主管部门下拉框
+const options = ref<IOptions[]>([])
+// 获取到组织信息
+const getDept = () => {
+  const params = {
+    roleId: '',
+    deptType: '',
+    tips: '',
+  }
+  getDeptTree(params).then((response) => {
+    options.value = response.data
+  })
+}
+getDept()
+const loadingTable = ref<boolean>(false)
+const total = ref<number>(0)
+const select = ref<number>(-1)
+const columns = ref<TableColumn[]>([
+  {
+    text: '计划编号',
+    value: 'planNo',
+    align: 'center',
+  },
+  {
+    text: '培训名称',
+    value: 'planName',
+    align: 'center',
+  },
+  {
+    text: '主管部门',
+    value: 'deptName',
+    align: 'center',
+  },
+  {
+    text: '实施单位',
+    value: 'effectiveCompany',
+    align: 'center',
+  },
+  {
+    text: '培训内容',
+    value: 'trainContent',
+    align: 'center',
+  },
+])
+const list = ref([])
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPlanList(listQuery.value).then((response) => {
+    list.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  })
+}
+fetchData(true)
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+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 search = () => {
+  fetchData(true)
+}
+// 重置
+const reset = () => {
+  listQuery.value = {
+    createEndTime: '',
+    createStartTime: '',
+    deptId: '',
+    director: '',
+    effectiveCompany: '',
+    ids: [],
+    trainEndTime: '',
+    formId: SCHEDULE.TRAIN_APPROVAL,
+    trainStartTime: '',
+    offset: 1,
+    limit: 20,
+  }
+}
+// 点击保存
+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
+  }
+  else {
+    ElMessage.warning('请先选择培训列表')
+  }
+}
+// 监听数据变化
+// watch(
+//   [() => props.list], ([newNums], [oldNums]) => {
+//     list.value = newNums
+//   },
+//   {
+//     immediate: true,
+//     deep: true,
+//   },
+// )
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+}
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-if="dialogFormVisible" v-model="dialogFormVisible" title="选择人员">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="reset">
+      <search-item>
+        <el-input v-model.trim="listQuery.director" placeholder="负责人" clearable />
+      </search-item>
+      <search-item>
+        <el-select
+          v-model="listQuery.deptId"
+          clearable
+          placeholder="主管部门"
+          size="default"
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list" :total="total" :columns="columns" :query="listQuery"
+        :list-loading="loadingTable" :pagination="false" @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/measure/train/planAdd.vue b/src/views/measure/train/planAdd.vue
index 61f6af0..2b67950 100644
--- a/src/views/measure/train/planAdd.vue
+++ b/src/views/measure/train/planAdd.vue
@@ -51,9 +51,9 @@
 const ruleFormRef = ref<FormInstance>()
 const columns = [
   { text: '学员名称', value: 'name' },
-  { text: '单位名称', value: 'company' },
+  { text: '单位名称', value: 'deptName' },
   { text: '技术职称', value: 'technologyJob' },
-  { text: '签到时间', value: 'signTime', type: '下拉' },
+  { text: '签到时间', value: 'createtime' },
 ]
 const dialogVisible = ref(false)
 const addPersonList = ref({
@@ -91,15 +91,6 @@
     { required: true, message: '培训内容不能为空', trigger: 'blur' },
   ],
 }) // 表单验证规则
-// 新增校验规则
-const addRules = ref({
-  name: [{ required: true, message: '学员名称不能为空', trigger: 'blur' }],
-  company: [{ required: true, message: '单位名称不能为空', trigger: 'blur' }],
-  technologyJob: [
-    { required: true, message: '技术职称不能为空', trigger: 'blur' },
-  ],
-  signTime: [{ required: true, message: '签到时间不能为空', trigger: 'blur' }],
-}) // 表单验证规则
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -112,22 +103,30 @@
   userListRef.value.initDialog()
 }
 const addRoow = () => {
-  Object.keys(addPersonList.value).forEach(
-    key => (addPersonList.value[key] = ''),
+  formInline.value.trainStaffList.push(
+    JSON.parse(JSON.stringify(addPersonList.value)),
   )
-  dialogVisible.value = true
+}
+// 记录点击的第几行
+const listIndex = ref(0)
+// 计量人员Ref
+const userTrainRef = ref()
+// 选择计量人员
+const handleClick = (index: number) => {
+  listIndex.value = index
+  userTrainRef.value.initDialog()
 }
 // 点击关闭
 const handleClose = () => {
   dialogVisible.value = false
 }
-// 点击弹窗的完成追加到表格数组中
-const addPushList = () => {
-  formInline.value.trainStaffList.push(
-    JSON.parse(JSON.stringify(addPersonList.value)),
-  )
-  handleClose()
-}
+// // 点击弹窗的完成追加到表格数组中
+// const addPushList = () => {
+//   formInline.value.trainStaffList.push(
+//     JSON.parse(JSON.stringify(addPersonList.value)),
+//   )
+//   handleClose()
+// }
 // 删除行
 const deleteList = () => {
   formInline.value.trainStaffList = formInline.value.trainStaffList.filter(
@@ -151,7 +150,6 @@
 }
 // 选择完负责人的函数
 const confirmPerson = (object: confirmPersonType) => {
-  console.log(object)
   formInline.value.director = object.name
 }
 if (infoId.value && infoId.value !== '') {
@@ -159,6 +157,12 @@
     formInline.value = res.data
   })
 }
+// 选完计量人员
+const confirmTrainPerson = (object: confirmPersonType) => {
+  console.log(object)
+  formInline.value.trainStaffList[listIndex.value] = object
+  formInline.value.trainStaffList[listIndex.value].staffId = object.id
+}
 // 点击提交
 const getAddList = async (
   formEl: FormInstance | undefined,
@@ -270,11 +274,11 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="计划编号:" prop="planNo">
+            <el-form-item label="计划编号:">
               <el-input
                 v-model="formInline.planNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入计划编号'"
-                :disabled="pageType === 'detail'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 计划编号'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -312,6 +316,7 @@
               <el-date-picker
                 v-model="formInline.trainTime"
                 type="datetime"
+                style="width: 100%;"
                 placeholder="培训时间"
                 format="YYYY/MM/DD HH:mm:ss"
                 value-format="YYYY-MM-DD h:m:s"
@@ -402,12 +407,12 @@
     </detail-page>
     <detail-block title="人员信息">
       <template #btns>
-        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
-          删除行
-        </el-button>
         <el-button v-if="pageType !== 'detail'" type="primary" @click="addRoow">
           增加行
         </el-button>
+        <el-button v-if="pageType !== 'detail'" type="info" @click="deleteList">
+          删除行
+        </el-button>
       </template>
       <el-table
         :data="formInline.trainStaffList"
@@ -422,55 +427,34 @@
           :key="item.value"
           :prop="item.value"
           :label="item.text"
-        />
+          align="center"
+        >
+          <template
+            v-if="item.text === '学员名称' && pageType !== 'detail'"
+            #default="scope"
+          >
+            <el-input
+              v-model="scope.row[item.value]"
+              :placeholder="`${item.text}`"
+              class="input"
+            >
+              <template #append>
+                <el-button
+                  v-if="pageType !== 'detail'"
+                  size="small"
+                  @click="handleClick(scope.$index)"
+                >
+                  选择
+                </el-button>
+              </template>
+            </el-input>
+          </template>
+        </el-table-column>
       </el-table>
     </detail-block>
   </app-container>
-  <el-dialog
-    v-model="dialogVisible"
-    title="添加人员信息"
-    width="30%"
-    :before-close="handleClose"
-  >
-    <el-form
-      ref="addPersonListForm"
-      label-position="left"
-      label-width="100px"
-      :model="addPersonList"
-      style="max-width: 460px;"
-      :rules="addRules"
-    >
-      <el-form-item label="学员名称" prop="name">
-        <el-input v-model="addPersonList.name" />
-      </el-form-item>
-      <el-form-item label="单位名称" prop="company">
-        <el-input v-model="addPersonList.company" />
-      </el-form-item>
-      <el-form-item label="技术职称" prop="technologyJob">
-        <el-input v-model="addPersonList.technologyJob" />
-      </el-form-item>
-      <el-form-item label="签到时间" prop="signTime">
-        <el-date-picker
-          v-model="addPersonList.signTime"
-          type="datetime"
-          placeholder="签到时间"
-          format="YYYY/MM/DD HH:mm:ss"
-          value-format="YYYY-MM-DD h:m:s"
-          :disabled="pageType === 'detail'"
-        />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <div class="dialog-footer">
-        <el-button type="primary" @click="addPushList">
-          完成
-        </el-button>
-        <el-button @click="dialogVisible = false">
-          取消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
   <!-- 选择用户列表组件 -->
   <user-list-dialog ref="userListRef" @add="confirmPerson" />
+  <!-- 选择计量人员组件列表 -->
+  <user-list-dialog ref="userTrainRef" @add="confirmTrainPerson" />
 </template>
diff --git a/src/views/measure/train/trainLogAdd.vue b/src/views/measure/train/trainLogAdd.vue
index 91e9bf4..afdae6d 100644
--- a/src/views/measure/train/trainLogAdd.vue
+++ b/src/views/measure/train/trainLogAdd.vue
@@ -3,6 +3,7 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { IOptions } from './plan_interface'
 import userListDialog from './components/userListDialog.vue'
+import PlanListDialog from './components/planListDialog.vue'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import useUserStore from '@/store/modules/user.ts'
 import {
@@ -10,7 +11,6 @@
   getListLogAdd,
   getListLogDetail,
   getListLogupdate,
-  getPlanIdList,
 } from '@/api/system/plan'
 
 const loading = ref(false) // 表单加载状态
@@ -76,6 +76,7 @@
   trainEffect: [{ required: true, message: '培训效果不能为空', trigger: 'blur' }],
   problems: [{ required: true, message: '存在问题不能为空', trigger: 'blur' }],
   improveMethod: [{ required: true, message: '改进措施不能为空', trigger: 'blur' }],
+  trainContent: [{ required: true, message: '培训内容不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 const userListRef = ref()
 const addPersonList = ref({
@@ -92,21 +93,6 @@
 const ListDetail = ref([])
 // 控制是否显示输入框开关
 const isNameShow = ref(true)
-// 获取到组织信息
-const getDept = () => {
-  const params = {
-    createTime: '',
-    deptId: 0,
-    director: '',
-    effectiveCompany: '',
-    formId: SCHEDULE.TRAIN_APPROVAL,
-    trainTime: '',
-  }
-  getPlanIdList(params).then((response) => {
-    options.value = response.data
-  })
-}
-getDept()
 // 初始化router
 const $router = useRouter()
 // 关闭新增页面的回调
@@ -124,8 +110,8 @@
     remark: '',
     signTime: '',
     technologyJob: '',
-    planId: 0,
-    staffId: 0,
+    planId: '',
+    staffId: '',
     isNameShow: false,
   }
   trainList.value.push(object)
@@ -171,6 +157,8 @@
 // 点击删除和编辑的参数类型
 interface rowReturn {
   isNameShow: boolean
+  id: string
+  planName: string
 }
 // 双击表格中默认显示的name
 const dblclickName = (row: rowReturn) => {
@@ -192,6 +180,7 @@
         if (buttonType === '提交' && pageType.value !== 'edit') {
           getListLogAdd(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('提交成功')
               close()
             }
           })
@@ -205,6 +194,7 @@
           formInline.value.id = infoId.value
           getListLogupdate(formInline.value).then((res) => {
             if (res.code === 200) {
+              ElMessage.success('提交成功')
               close()
             }
           })
@@ -230,10 +220,28 @@
   userListRef.value.initDialog()
   listIndex.value = index
 }
+
+const planListDialog = ref()
+// 选择培训数据
+const selectPlanId = () => {
+  planListDialog.value.initDialog()
+}
+// 选择培训数据完成之后
+const confirmPlan = (data: rowReturn) => {
+  getListDetail({ id: data.id }).then((res) => {
+    ListDetail.value = res.data.trainStaffList
+    res.data.preparer = name
+    formInline.value = { ...res.data }
+    formInline.value.planId = data.id
+    formInline.value.trainName = data.planName
+  })
+}
 // 选择完负责人的函数
-const confirmPerson = (object: object) => {
+const confirmPerson = (object: rowReturn) => {
   if (!trainList.value.includes(object)) {
     trainList.value[listIndex.value] = object
+    trainList.value[listIndex.value].staffId = object.id
+    delete trainList.value[listIndex.value].id
   }
   else {
     ElMessage.warning('该学员已经存在')
@@ -273,11 +281,11 @@
       >
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="编号:" prop="logNo">
+            <el-form-item label="培训计划编号:">
               <el-input
                 v-model="formInline.logNo"
-                :placeholder="pageType === 'detail' ? '无' : '请输入编号'"
-                :disabled="pageType === 'detail'"
+                :placeholder="pageType === 'detail' ? '无' : '系统自动生成 培训计划编号'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -291,22 +299,22 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item v-if="infoId === ''" label="计划编号:" prop="planId">
-              <el-select
+            <el-form-item label="计划编号:" prop="planId">
+              <el-input
                 v-model="formInline.planId"
-                clearable
-                placeholder="计划编号"
-                size="default"
+                :placeholder="pageType === 'detail' ? '无' : '请选择计划编号'"
                 :disabled="pageType === 'detail'"
-                @change="selectChange"
               >
-                <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.planName"
-                  :value="item.id"
-                />
-              </el-select>
+                <template #append>
+                  <el-button
+                    size="small"
+                    :disabled="pageType === 'detail'"
+                    @click="selectPlanId"
+                  >
+                    选择
+                  </el-button>
+                </template>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -373,6 +381,17 @@
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="12">
+            <el-form-item label="培训内容:" prop="trainContent">
+              <el-input
+                v-model="formInline.trainContent"
+                :placeholder="pageType === 'detail' ? '无' : '请输入培训内容'"
+                :disabled="pageType === 'detail'"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24" class="marg">
+          <el-col :span="12">
             <el-form-item label="培训效果:" prop="trainEffect">
               <el-input
                 v-model="formInline.trainEffect"
@@ -461,5 +480,7 @@
   </app-container>
   <!-- 选择用户列表组件 -->
   <user-list-dialog ref="userListRef" :list="formInline.trainStaffList" @add="confirmPerson" />
+  <!-- 选择培训数据组件 -->
+  <plan-list-dialog ref="planListDialog" @add="confirmPlan" />
 </template>
 
diff --git a/src/views/measure/train/trainPlanApprove.vue b/src/views/measure/train/trainPlanApprove.vue
index 2421142..1e3144a 100644
--- a/src/views/measure/train/trainPlanApprove.vue
+++ b/src/views/measure/train/trainPlanApprove.vue
@@ -76,6 +76,17 @@
     currentTab.value = currentMenu?.name
   }
 }
+
+// 组件销毁时存入自己的审批类型 下次进去还是原来的审批类型
+onUnmounted(() => {
+  sessionStorage.setItem('trinPlanListMenu', currentTab.value)
+})
+// 挂载的时候找到之前存过的审批类型
+onMounted(() => {
+  currentTab.value = sessionStorage.getItem('trinPlanListMenu') || '全部'
+  sessionStorage.getItem('trinPlanListMenu') ? sessionStorage.removeItem('trinPlanListMenu') : ''
+})
+
 watch(currentTab, (newValue) => {
   currentApprovalStatus.value = approvalStatusList[newValue]
   currentButtons.value = buttonsSet[newValue]