diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 39efdb5..b0b0037 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -316,13 +316,13 @@
 }
 
 // --------------------------------------原始记录模板-----------------------------------
-// 选择环境记录单Ref
+// 选择原始记录模板Ref
 const templateDialog = ref()
-// 选择环境记录单
+// 选择原始记录模板
 const handleClickTemplate = () => {
   templateDialog.value.initDialog()
 }
-// 选择环境记录单表格确认
+// 选择原始记录模板确认
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
@@ -331,11 +331,13 @@
 // ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
+  if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+      !item.equipmentNo && !item.equipmentName)
+    if (index !== -1) {
+      ElMessage.warning('请完善上一条设备信息')
+      return
+    }
   }
   formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
@@ -469,12 +471,18 @@
   if (infoId.value) {
     getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
       formInline.value = res.data
-      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
-        }
-      })
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        formInline.value.equipmentInfoList = []
+      }
+      formInline.value.fileList = res.data.fileList || []
     })
   }
 }

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 39efdb5..b0b0037 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -316,13 +316,13 @@
 }
 
 // --------------------------------------原始记录模板-----------------------------------
-// 选择环境记录单Ref
+// 选择原始记录模板Ref
 const templateDialog = ref()
-// 选择环境记录单
+// 选择原始记录模板
 const handleClickTemplate = () => {
   templateDialog.value.initDialog()
 }
-// 选择环境记录单表格确认
+// 选择原始记录模板确认
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
@@ -331,11 +331,13 @@
 // ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
+  if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+      !item.equipmentNo && !item.equipmentName)
+    if (index !== -1) {
+      ElMessage.warning('请完善上一条设备信息')
+      return
+    }
   }
   formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
@@ -469,12 +471,18 @@
   if (infoId.value) {
     getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
       formInline.value = res.data
-      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
-        }
-      })
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        formInline.value.equipmentInfoList = []
+      }
+      formInline.value.fileList = res.data.fileList || []
     })
   }
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c663f79..17040fc 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -4,11 +4,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, columnsType } from '../report_interface'
+import type { IFileList, columnsType, dictType } from '../report_interface'
 import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
 import SelectFiles from '../../components/selectFiles.vue'
+import selectPrimitiveLogList from '../../components/selectPrimitiveLogList.vue'
+import selectReportTemplate from '../../components/selectReportTemplate.vue'
+import selectSignature from '../../components/selectSignature.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -20,54 +24,45 @@
 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'
-import { addReport } from '@/api/business/lab/report'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import {
+  addReport,
+  draftUpdateReport,
+  failUpdateReport,
+  getReportDetail,
+  submitReport,
+} from '@/api/business/lab/report'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
 import type { fileListType } from '@/views/measure/file/file-interface'
+import { getDictByCode } from '@/api/system/dict'
 
 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: '查看',
 } // 字典
-const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
-const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
-const checkoutMeasureDeviceList = ref([]) // 所用设备多选
-const checkoutFilesList = ref([]) // 技术文件多选
-const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
-const filesVisible = ref(false) // 控制选择技术文件对话框显隐
-// 从路由中获取页面类型参数
+const primitiveLogVisible = ref(false) // 控制选择原始记录对话框显隐
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const certificationClassMap = ref<dictType[]>([]) // 证书报告类型
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type 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 from = ref('') // reject表示未通过驳回跳转过来的
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref({
+  taskId: '', // 任务id，用于审批
+  processId: '', // 	流程实例id
+  processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
   approvalSignId: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
-  approvalStatus: '', // 审批状态
+  approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
   calibrationMajorName: '', // 检校专业名称
+  certificateReportType: '', // 证书报告类型
   certificateReportCategory: '', // 证书类别
   certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
@@ -76,21 +71,21 @@
   issuanceDate: '', // 出具日期
   measureDeptId: '', // 检定部门id
   measurePersonId: '', // 检定人员
-  measureResult: '', // 检定结果
+  measureResult: '1', // 检定结果--(后端要求传1，写死)
   orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  printNum: '', // 	打印次数
-  printStatus: '', // 	可打印状态
-  processId: '', // 	流程实例id
+  printNum: 0, // 	打印次数(后端要求传0，写死)
+  printStatus: '3', // 	可打印状态--(后端要求传3，写死)
   sampleId: '', // 	样品id
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   remark: '', // 证书报告备注
   templateId: '', // 证书报告模板id
   templateName: '', // 证书报告模板名称
-  businessOriginalRecord: {
+  certifications: '', // 证书类别--用于传参
+  businessOriginalRecord: { // 原始记录下的内容
     calibrationPlace: '', // 检校地点
-    originalRecordNo: '', // 原始记录编号
+    originalRecordCode: '', // 原始记录编号
     businessEnvironmentRecord: { // 环境记录单
       temperature: '', // 环境记录单温度
       humidity: '', // 环境记录单相对湿度
@@ -114,60 +109,74 @@
       customerAddress: '', // 委托方地址
       planDeliverTime: '', // 预计送达时间
       requireOverTime: '', // 要求检完时间
+      certifications: '', // 证书类别
     },
+    equipmentInfoList: [] as any, // 测量设备
+    fileList: [] as any, // 技术文件
   } as any, // 原始记录
-  equipmentInfoList: [] as any, // 测量设备
-  fileList: [] as any, // 技术文件
-})
 
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-interface standardOwnerOptionsType {
-  id: string
-  name: string
-}
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-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 standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  infoId.value = $route.params.id as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
   }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  if ($route.query.from) {
+    from.value = $route.query.from as string
+  }
+  if ($route.query.processId) {
+    formInline.value.processId = $route.query.processId as string
+  }
 }
+
+// 表单验证规则
+const rules = ref({
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书报告名称不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportType': [{ required: true, message: '证书报告类型不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'expirationDate': [{ required: true, message: '有效日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordCode': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationClass')
+  certificationClassMap.value = resCertificationClass.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+
+const approvalDialog = ref()
+
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -261,7 +270,6 @@
   },
 ])
 
-getStandardOwnerOptions()
 // 初始化路由
 const $router = useRouter()
 
@@ -269,29 +277,6 @@
 const close = () => {
   $router.back()
 }
-// 表单验证规则
-const rules = ref({
-  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
-  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
-})
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -317,26 +302,6 @@
   fileRef.value.click()
 }
 
-// 获取详情信息
-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.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
-      item.choose = true
-      return item
-    })
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -374,22 +339,22 @@
   }
 }
 
-// 保存后的id
+// 保存后的id，用于提交
 const addId = ref('')
-// 点击顶部一排按钮
+// 保存、提交、关闭
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') { // 新建的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       if (valid) {
         ElMessageBox.confirm('确认保存吗？', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-          getStandardLisAdd(fromListInfo.value).then((res) => {
+          addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -399,23 +364,33 @@
       }
     })
   }
-  else if (item === '保存' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') { // 编辑的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       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
-            }
-          })
+          if (from.value === 'caogao') { // 草稿箱编辑
+            draftUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else if (from.value === 'reject') { // 未通过-驳回编辑
+            failUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         })
       }
     })
@@ -425,11 +400,12 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({
+      submitReport({
         id: addId.value,
-        formId: formId.value,
+        formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
       }).then((res) => {
         if (res.code === 200) {
+          ElMessage.success('已提交')
           close()
         }
       })
@@ -439,34 +415,9 @@
     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 = () => {}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -483,143 +434,114 @@
 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()
-      }
-    })
+const getInfo = () => {
+  getReportDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
+    if (res.data.businessOriginalRecord.equipmentInfoList && res.data.businessOriginalRecord.equipmentInfoList.length) {
+      formInline.value.businessOriginalRecord.equipmentInfoList = res.data.businessOriginalRecord.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    }
+    else {
+      formInline.value.businessOriginalRecord.equipmentInfoList = []
+    }
+    formInline.value.businessOriginalRecord.fileList = res.data.businessOriginalRecord.fileList || []
   })
 }
 
-// ----------------------------------------所用设备-------------------------------------
-// 点击所用设备增加行
-const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  formInline.value.equipmentInfoList.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    validDate: '', // 有效日期
-    manufacturingNo: '', // 出厂编号
-  })
-}
-
-const handleSelectionChangeMeasureDevice = (e: any) => {
-  checkoutMeasureDeviceList.value = e
-}
-
-// 点击所用设备删除行
-const delMeasureDeviceRow = () => {
-  if (checkoutMeasureDeviceList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
     })
   }
   else {
-    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.equipmentInfoList.splice(index, 1)
-        }
-      })
-    })
+    ElMessage.warning('流程实例id为空')
   }
 }
 
-// 点击选择测量设备编号
-const handleClickMeasureDevice = (index: number) => {
-  measureDeviceVisible.value = true
-  selectIndex.value = index
-}
-// 修改测量设备对话框显隐
-const changeMeasureDeviceVisible = (val: boolean) => {
-  measureDeviceVisible.value = val
-}
-// 选好测量设备
-const confirmCheckoutMeasureDevice = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
-  }
+// -------------------------------------------原始记录------------------------------------
+// 点击选择原始记录编号
+const handleClickPrimitiveLog = () => {
+  primitiveLogVisible.value = true
 }
 
-// ------------------------------------------技术文件----------------------------------
-// 点击技术文件增加行
-const addFilesRow = () => {
-  console.log(formInline.value.fileList)
+// 修改原始记录对话框显隐
+const changePrimitiveLogVisible = (val: boolean) => {
+  primitiveLogVisible.value = val
+}
+// 选好原始记录
+const confirmCheckoutPrimitiveLog = (val: any) => {
+  console.log(val)
 
-  const index = formInline.value.fileList.findIndex((item: fileListType) =>
-    !item.fileNo && !item.fileName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条文件信息')
-    return
-  }
-  formInline.value.fileList.push({
-    fileNo: '', // 编号
-    fileName: '', // 名称
-    fileCode: '', // 文件号
-  })
+  formInline.value.businessOriginalRecord = val
+  formInline.value.certifications = val.businessOrder.certifications // 证书类别
+  formInline.value.certificateReportCategory = val.businessOrder.certifications // 证书类别
+  formInline.value.sampleId = val.customerSampleInfo.id // 样品id
+  formInline.value.orderId = val.businessOrder.id // 委托书id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+}
+// --------------------------------------证书报告模板-----------------------------------
+// 选择证书报告模板Ref
+const templateDialog = ref()
+// 选择证书报告模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书报告模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  formInline.value.templateId = val.id // 证书报告模板id
+  formInline.value.templateName = val.templateName || '' // 证书报告模板名称
 }
 
-// 技术文件表格多选
-const handleSelectionChangeFiles = (e: any) => {
-  checkoutFilesList.value = e
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
 }
-// 点击技术文件删除行
-const delFilesRow = () => {
-  if (checkoutFilesList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutFilesList.value.forEach((item: fileListType) => {
-      formInline.value.fileList.forEach((element: fileListType, index: number) => {
-        if (element.fileNo === item.fileNo) {
-          formInline.value.fileList.splice(index, 1)
-        }
-      })
-    })
-  }
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  formInline.value.signId = val.id // 电子签章id
+  formInline.value.signName = val.signName || '' // 电子签章名称
 }
 
-// 点击选择文件编号
-const handleClickFiles = (index: number) => {
-  filesVisible.value = true
-  selectFliesIndex.value = index
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
 }
-// 修改技术文件对话框显隐
-const changeFilesVisible = (val: boolean) => {
-  filesVisible.value = val
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  formInline.value.approvalSignId = val.id // 认可标志专用章id
+  formInline.value.approvalSignName = val.signName || '' // 认可标志专用章名称
 }
-// 选好测量设备
-const confirmCheckoutFiles = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
-    }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
-  }
-}
-
 // -------------------------------------------底部-------------------------------------------
+
+onMounted(() => {
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情
+    formInline.value.taskId = JSON.parse($route.query.row as string).taskId // 任务id（同意、驳回等操作使用）
+    formInline.value.processId = JSON.parse($route.query.row as string).processId // 流程实例id
+    formInline.value.processInstanceId = JSON.parse($route.query.row as string).processInstanceId // 流程实例id（取消操作使用）
+    approvalStatusName.value = JSON.parse($route.query.row as string).approvalStatusName
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord(formInline.value.processId) // 查询审批记录
+    }
+  }
+})
 </script>
 
 <template>
@@ -647,6 +569,28 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="证书报告编号:">
+              <el-input
+                v-model.trim="formInline.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="formInline.certificateReportName"
+                :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="calibrationMajor">
               <el-select
                 v-model="formInline.calibrationMajor"
@@ -657,10 +601,10 @@
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -680,27 +624,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:" prop="certificateReportCode">
-              <el-input
-                v-model.trim="formInline.certificateReportCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
-                class="full-width-input"
+            <el-form-item label="有效日期:" prop="expirationDate">
+              <el-date-picker
+                v-model="formInline.expirationDate"
+                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="certificateReportName">
-              <el-input
-                v-model.trim="formInline.certificateReportName"
-                :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="templateName">
               <el-input
@@ -710,9 +647,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickTemplate">
                     选择
                   </el-button>
                 </template>
@@ -720,6 +655,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="证书报告类型:" prop="certificateReportType">
+              <el-select
+                v-model="formInline.certificateReportType"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in certificationClassMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="电子签章:" prop="signName">
               <el-input
                 v-model.trim="formInline.signName"
@@ -728,9 +682,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSignature">
                     选择
                   </el-button>
                 </template>
@@ -746,9 +698,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSpecialSignature">
                     选择
                   </el-button>
                 </template>
@@ -756,17 +706,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
+            <el-form-item label="原始记录编号:">
               <el-input
-                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickPrimitiveLog">
                     选择
                   </el-button>
                 </template>
@@ -774,136 +721,142 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
+            <el-form-item label="检校地点:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
-                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
+            <el-form-item label="温度(℃):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
+            <el-form-item label="相对湿度(%):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
+            <el-form-item label="样品编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
+            <el-form-item label="样品名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
+            <el-form-item label="出厂编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
+            <el-form-item label="型号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
+            <el-form-item label="委托方代码:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
+            <el-form-item label="委托方名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
+            <el-form-item label="委托方电话:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
+              <el-select
+                v-model="formInline.businessOriginalRecord.businessOrder.certifications"
+                clearable
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
+            <el-form-item label="委托方地址:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -913,10 +866,9 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -924,10 +876,9 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
-                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -938,10 +889,9 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -951,24 +901,22 @@
                 v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
+            <el-form-item label="检定项目:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -1001,29 +949,11 @@
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
-          增加行
-        </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="delMeasureDeviceRow"
-        >
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.equipmentInfoList"
+        :data="formInline.businessOriginalRecord.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeMeasureDevice"
       >
-        <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"
@@ -1032,54 +962,15 @@
           :label="item.text"
           :width="item.width"
           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"
-                  type="primary"
-                  @click="handleClickMeasureDevice(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="addFilesRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="delFilesRow">
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.fileList"
+        :data="formInline.businessOriginalRecord.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeFiles"
       >
-        <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"
@@ -1088,59 +979,24 @@
           :label="item.text"
           :width="item.width"
           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="handleClickFiles(scope.$index)"
-                >
-                  选择
-                </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>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
-  <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <!-- 选择原始记录 -->
+  <select-primitive-log-list v-model:visible="primitiveLogVisible" @confirm-checkout="confirmCheckoutPrimitiveLog" @change-visible="changePrimitiveLogVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择签章 -->
+  <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+  <!-- 选择认可标志专用签章 -->
+  <select-signature ref="specialSignatureDialog" @add="confirmCheckoutSpecialSignature" />
 </template>
 
 <style lang="scss">

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 39efdb5..b0b0037 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -316,13 +316,13 @@
 }
 
 // --------------------------------------原始记录模板-----------------------------------
-// 选择环境记录单Ref
+// 选择原始记录模板Ref
 const templateDialog = ref()
-// 选择环境记录单
+// 选择原始记录模板
 const handleClickTemplate = () => {
   templateDialog.value.initDialog()
 }
-// 选择环境记录单表格确认
+// 选择原始记录模板确认
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
@@ -331,11 +331,13 @@
 // ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
+  if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+      !item.equipmentNo && !item.equipmentName)
+    if (index !== -1) {
+      ElMessage.warning('请完善上一条设备信息')
+      return
+    }
   }
   formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
@@ -469,12 +471,18 @@
   if (infoId.value) {
     getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
       formInline.value = res.data
-      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
-        }
-      })
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        formInline.value.equipmentInfoList = []
+      }
+      formInline.value.fileList = res.data.fileList || []
     })
   }
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c663f79..17040fc 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -4,11 +4,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, columnsType } from '../report_interface'
+import type { IFileList, columnsType, dictType } from '../report_interface'
 import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
 import SelectFiles from '../../components/selectFiles.vue'
+import selectPrimitiveLogList from '../../components/selectPrimitiveLogList.vue'
+import selectReportTemplate from '../../components/selectReportTemplate.vue'
+import selectSignature from '../../components/selectSignature.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -20,54 +24,45 @@
 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'
-import { addReport } from '@/api/business/lab/report'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import {
+  addReport,
+  draftUpdateReport,
+  failUpdateReport,
+  getReportDetail,
+  submitReport,
+} from '@/api/business/lab/report'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
 import type { fileListType } from '@/views/measure/file/file-interface'
+import { getDictByCode } from '@/api/system/dict'
 
 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: '查看',
 } // 字典
-const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
-const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
-const checkoutMeasureDeviceList = ref([]) // 所用设备多选
-const checkoutFilesList = ref([]) // 技术文件多选
-const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
-const filesVisible = ref(false) // 控制选择技术文件对话框显隐
-// 从路由中获取页面类型参数
+const primitiveLogVisible = ref(false) // 控制选择原始记录对话框显隐
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const certificationClassMap = ref<dictType[]>([]) // 证书报告类型
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type 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 from = ref('') // reject表示未通过驳回跳转过来的
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref({
+  taskId: '', // 任务id，用于审批
+  processId: '', // 	流程实例id
+  processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
   approvalSignId: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
-  approvalStatus: '', // 审批状态
+  approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
   calibrationMajorName: '', // 检校专业名称
+  certificateReportType: '', // 证书报告类型
   certificateReportCategory: '', // 证书类别
   certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
@@ -76,21 +71,21 @@
   issuanceDate: '', // 出具日期
   measureDeptId: '', // 检定部门id
   measurePersonId: '', // 检定人员
-  measureResult: '', // 检定结果
+  measureResult: '1', // 检定结果--(后端要求传1，写死)
   orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  printNum: '', // 	打印次数
-  printStatus: '', // 	可打印状态
-  processId: '', // 	流程实例id
+  printNum: 0, // 	打印次数(后端要求传0，写死)
+  printStatus: '3', // 	可打印状态--(后端要求传3，写死)
   sampleId: '', // 	样品id
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   remark: '', // 证书报告备注
   templateId: '', // 证书报告模板id
   templateName: '', // 证书报告模板名称
-  businessOriginalRecord: {
+  certifications: '', // 证书类别--用于传参
+  businessOriginalRecord: { // 原始记录下的内容
     calibrationPlace: '', // 检校地点
-    originalRecordNo: '', // 原始记录编号
+    originalRecordCode: '', // 原始记录编号
     businessEnvironmentRecord: { // 环境记录单
       temperature: '', // 环境记录单温度
       humidity: '', // 环境记录单相对湿度
@@ -114,60 +109,74 @@
       customerAddress: '', // 委托方地址
       planDeliverTime: '', // 预计送达时间
       requireOverTime: '', // 要求检完时间
+      certifications: '', // 证书类别
     },
+    equipmentInfoList: [] as any, // 测量设备
+    fileList: [] as any, // 技术文件
   } as any, // 原始记录
-  equipmentInfoList: [] as any, // 测量设备
-  fileList: [] as any, // 技术文件
-})
 
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-interface standardOwnerOptionsType {
-  id: string
-  name: string
-}
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-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 standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  infoId.value = $route.params.id as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
   }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  if ($route.query.from) {
+    from.value = $route.query.from as string
+  }
+  if ($route.query.processId) {
+    formInline.value.processId = $route.query.processId as string
+  }
 }
+
+// 表单验证规则
+const rules = ref({
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书报告名称不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportType': [{ required: true, message: '证书报告类型不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'expirationDate': [{ required: true, message: '有效日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordCode': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationClass')
+  certificationClassMap.value = resCertificationClass.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+
+const approvalDialog = ref()
+
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -261,7 +270,6 @@
   },
 ])
 
-getStandardOwnerOptions()
 // 初始化路由
 const $router = useRouter()
 
@@ -269,29 +277,6 @@
 const close = () => {
   $router.back()
 }
-// 表单验证规则
-const rules = ref({
-  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
-  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
-})
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -317,26 +302,6 @@
   fileRef.value.click()
 }
 
-// 获取详情信息
-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.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
-      item.choose = true
-      return item
-    })
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -374,22 +339,22 @@
   }
 }
 
-// 保存后的id
+// 保存后的id，用于提交
 const addId = ref('')
-// 点击顶部一排按钮
+// 保存、提交、关闭
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') { // 新建的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       if (valid) {
         ElMessageBox.confirm('确认保存吗？', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-          getStandardLisAdd(fromListInfo.value).then((res) => {
+          addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -399,23 +364,33 @@
       }
     })
   }
-  else if (item === '保存' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') { // 编辑的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       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
-            }
-          })
+          if (from.value === 'caogao') { // 草稿箱编辑
+            draftUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else if (from.value === 'reject') { // 未通过-驳回编辑
+            failUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         })
       }
     })
@@ -425,11 +400,12 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({
+      submitReport({
         id: addId.value,
-        formId: formId.value,
+        formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
       }).then((res) => {
         if (res.code === 200) {
+          ElMessage.success('已提交')
           close()
         }
       })
@@ -439,34 +415,9 @@
     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 = () => {}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -483,143 +434,114 @@
 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()
-      }
-    })
+const getInfo = () => {
+  getReportDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
+    if (res.data.businessOriginalRecord.equipmentInfoList && res.data.businessOriginalRecord.equipmentInfoList.length) {
+      formInline.value.businessOriginalRecord.equipmentInfoList = res.data.businessOriginalRecord.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    }
+    else {
+      formInline.value.businessOriginalRecord.equipmentInfoList = []
+    }
+    formInline.value.businessOriginalRecord.fileList = res.data.businessOriginalRecord.fileList || []
   })
 }
 
-// ----------------------------------------所用设备-------------------------------------
-// 点击所用设备增加行
-const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  formInline.value.equipmentInfoList.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    validDate: '', // 有效日期
-    manufacturingNo: '', // 出厂编号
-  })
-}
-
-const handleSelectionChangeMeasureDevice = (e: any) => {
-  checkoutMeasureDeviceList.value = e
-}
-
-// 点击所用设备删除行
-const delMeasureDeviceRow = () => {
-  if (checkoutMeasureDeviceList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
     })
   }
   else {
-    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.equipmentInfoList.splice(index, 1)
-        }
-      })
-    })
+    ElMessage.warning('流程实例id为空')
   }
 }
 
-// 点击选择测量设备编号
-const handleClickMeasureDevice = (index: number) => {
-  measureDeviceVisible.value = true
-  selectIndex.value = index
-}
-// 修改测量设备对话框显隐
-const changeMeasureDeviceVisible = (val: boolean) => {
-  measureDeviceVisible.value = val
-}
-// 选好测量设备
-const confirmCheckoutMeasureDevice = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
-  }
+// -------------------------------------------原始记录------------------------------------
+// 点击选择原始记录编号
+const handleClickPrimitiveLog = () => {
+  primitiveLogVisible.value = true
 }
 
-// ------------------------------------------技术文件----------------------------------
-// 点击技术文件增加行
-const addFilesRow = () => {
-  console.log(formInline.value.fileList)
+// 修改原始记录对话框显隐
+const changePrimitiveLogVisible = (val: boolean) => {
+  primitiveLogVisible.value = val
+}
+// 选好原始记录
+const confirmCheckoutPrimitiveLog = (val: any) => {
+  console.log(val)
 
-  const index = formInline.value.fileList.findIndex((item: fileListType) =>
-    !item.fileNo && !item.fileName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条文件信息')
-    return
-  }
-  formInline.value.fileList.push({
-    fileNo: '', // 编号
-    fileName: '', // 名称
-    fileCode: '', // 文件号
-  })
+  formInline.value.businessOriginalRecord = val
+  formInline.value.certifications = val.businessOrder.certifications // 证书类别
+  formInline.value.certificateReportCategory = val.businessOrder.certifications // 证书类别
+  formInline.value.sampleId = val.customerSampleInfo.id // 样品id
+  formInline.value.orderId = val.businessOrder.id // 委托书id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+}
+// --------------------------------------证书报告模板-----------------------------------
+// 选择证书报告模板Ref
+const templateDialog = ref()
+// 选择证书报告模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书报告模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  formInline.value.templateId = val.id // 证书报告模板id
+  formInline.value.templateName = val.templateName || '' // 证书报告模板名称
 }
 
-// 技术文件表格多选
-const handleSelectionChangeFiles = (e: any) => {
-  checkoutFilesList.value = e
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
 }
-// 点击技术文件删除行
-const delFilesRow = () => {
-  if (checkoutFilesList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutFilesList.value.forEach((item: fileListType) => {
-      formInline.value.fileList.forEach((element: fileListType, index: number) => {
-        if (element.fileNo === item.fileNo) {
-          formInline.value.fileList.splice(index, 1)
-        }
-      })
-    })
-  }
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  formInline.value.signId = val.id // 电子签章id
+  formInline.value.signName = val.signName || '' // 电子签章名称
 }
 
-// 点击选择文件编号
-const handleClickFiles = (index: number) => {
-  filesVisible.value = true
-  selectFliesIndex.value = index
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
 }
-// 修改技术文件对话框显隐
-const changeFilesVisible = (val: boolean) => {
-  filesVisible.value = val
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  formInline.value.approvalSignId = val.id // 认可标志专用章id
+  formInline.value.approvalSignName = val.signName || '' // 认可标志专用章名称
 }
-// 选好测量设备
-const confirmCheckoutFiles = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
-    }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
-  }
-}
-
 // -------------------------------------------底部-------------------------------------------
+
+onMounted(() => {
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情
+    formInline.value.taskId = JSON.parse($route.query.row as string).taskId // 任务id（同意、驳回等操作使用）
+    formInline.value.processId = JSON.parse($route.query.row as string).processId // 流程实例id
+    formInline.value.processInstanceId = JSON.parse($route.query.row as string).processInstanceId // 流程实例id（取消操作使用）
+    approvalStatusName.value = JSON.parse($route.query.row as string).approvalStatusName
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord(formInline.value.processId) // 查询审批记录
+    }
+  }
+})
 </script>
 
 <template>
@@ -647,6 +569,28 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="证书报告编号:">
+              <el-input
+                v-model.trim="formInline.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="formInline.certificateReportName"
+                :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="calibrationMajor">
               <el-select
                 v-model="formInline.calibrationMajor"
@@ -657,10 +601,10 @@
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -680,27 +624,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:" prop="certificateReportCode">
-              <el-input
-                v-model.trim="formInline.certificateReportCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
-                class="full-width-input"
+            <el-form-item label="有效日期:" prop="expirationDate">
+              <el-date-picker
+                v-model="formInline.expirationDate"
+                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="certificateReportName">
-              <el-input
-                v-model.trim="formInline.certificateReportName"
-                :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="templateName">
               <el-input
@@ -710,9 +647,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickTemplate">
                     选择
                   </el-button>
                 </template>
@@ -720,6 +655,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="证书报告类型:" prop="certificateReportType">
+              <el-select
+                v-model="formInline.certificateReportType"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in certificationClassMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="电子签章:" prop="signName">
               <el-input
                 v-model.trim="formInline.signName"
@@ -728,9 +682,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSignature">
                     选择
                   </el-button>
                 </template>
@@ -746,9 +698,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSpecialSignature">
                     选择
                   </el-button>
                 </template>
@@ -756,17 +706,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
+            <el-form-item label="原始记录编号:">
               <el-input
-                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickPrimitiveLog">
                     选择
                   </el-button>
                 </template>
@@ -774,136 +721,142 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
+            <el-form-item label="检校地点:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
-                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
+            <el-form-item label="温度(℃):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
+            <el-form-item label="相对湿度(%):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
+            <el-form-item label="样品编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
+            <el-form-item label="样品名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
+            <el-form-item label="出厂编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
+            <el-form-item label="型号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
+            <el-form-item label="委托方代码:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
+            <el-form-item label="委托方名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
+            <el-form-item label="委托方电话:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
+              <el-select
+                v-model="formInline.businessOriginalRecord.businessOrder.certifications"
+                clearable
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
+            <el-form-item label="委托方地址:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -913,10 +866,9 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -924,10 +876,9 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
-                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -938,10 +889,9 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -951,24 +901,22 @@
                 v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
+            <el-form-item label="检定项目:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -1001,29 +949,11 @@
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
-          增加行
-        </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="delMeasureDeviceRow"
-        >
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.equipmentInfoList"
+        :data="formInline.businessOriginalRecord.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeMeasureDevice"
       >
-        <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"
@@ -1032,54 +962,15 @@
           :label="item.text"
           :width="item.width"
           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"
-                  type="primary"
-                  @click="handleClickMeasureDevice(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="addFilesRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="delFilesRow">
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.fileList"
+        :data="formInline.businessOriginalRecord.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeFiles"
       >
-        <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"
@@ -1088,59 +979,24 @@
           :label="item.text"
           :width="item.width"
           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="handleClickFiles(scope.$index)"
-                >
-                  选择
-                </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>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
-  <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <!-- 选择原始记录 -->
+  <select-primitive-log-list v-model:visible="primitiveLogVisible" @confirm-checkout="confirmCheckoutPrimitiveLog" @change-visible="changePrimitiveLogVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择签章 -->
+  <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+  <!-- 选择认可标志专用签章 -->
+  <select-signature ref="specialSignatureDialog" @add="confirmCheckoutSpecialSignature" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 4f29225..21b9831 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -35,6 +35,7 @@
   ],
   未通过: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
   已取消: [

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 39efdb5..b0b0037 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -316,13 +316,13 @@
 }
 
 // --------------------------------------原始记录模板-----------------------------------
-// 选择环境记录单Ref
+// 选择原始记录模板Ref
 const templateDialog = ref()
-// 选择环境记录单
+// 选择原始记录模板
 const handleClickTemplate = () => {
   templateDialog.value.initDialog()
 }
-// 选择环境记录单表格确认
+// 选择原始记录模板确认
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
@@ -331,11 +331,13 @@
 // ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
+  if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+      !item.equipmentNo && !item.equipmentName)
+    if (index !== -1) {
+      ElMessage.warning('请完善上一条设备信息')
+      return
+    }
   }
   formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
@@ -469,12 +471,18 @@
   if (infoId.value) {
     getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
       formInline.value = res.data
-      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
-        }
-      })
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        formInline.value.equipmentInfoList = []
+      }
+      formInline.value.fileList = res.data.fileList || []
     })
   }
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c663f79..17040fc 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -4,11 +4,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, columnsType } from '../report_interface'
+import type { IFileList, columnsType, dictType } from '../report_interface'
 import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
 import SelectFiles from '../../components/selectFiles.vue'
+import selectPrimitiveLogList from '../../components/selectPrimitiveLogList.vue'
+import selectReportTemplate from '../../components/selectReportTemplate.vue'
+import selectSignature from '../../components/selectSignature.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -20,54 +24,45 @@
 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'
-import { addReport } from '@/api/business/lab/report'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import {
+  addReport,
+  draftUpdateReport,
+  failUpdateReport,
+  getReportDetail,
+  submitReport,
+} from '@/api/business/lab/report'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
 import type { fileListType } from '@/views/measure/file/file-interface'
+import { getDictByCode } from '@/api/system/dict'
 
 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: '查看',
 } // 字典
-const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
-const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
-const checkoutMeasureDeviceList = ref([]) // 所用设备多选
-const checkoutFilesList = ref([]) // 技术文件多选
-const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
-const filesVisible = ref(false) // 控制选择技术文件对话框显隐
-// 从路由中获取页面类型参数
+const primitiveLogVisible = ref(false) // 控制选择原始记录对话框显隐
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const certificationClassMap = ref<dictType[]>([]) // 证书报告类型
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type 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 from = ref('') // reject表示未通过驳回跳转过来的
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref({
+  taskId: '', // 任务id，用于审批
+  processId: '', // 	流程实例id
+  processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
   approvalSignId: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
-  approvalStatus: '', // 审批状态
+  approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
   calibrationMajorName: '', // 检校专业名称
+  certificateReportType: '', // 证书报告类型
   certificateReportCategory: '', // 证书类别
   certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
@@ -76,21 +71,21 @@
   issuanceDate: '', // 出具日期
   measureDeptId: '', // 检定部门id
   measurePersonId: '', // 检定人员
-  measureResult: '', // 检定结果
+  measureResult: '1', // 检定结果--(后端要求传1，写死)
   orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  printNum: '', // 	打印次数
-  printStatus: '', // 	可打印状态
-  processId: '', // 	流程实例id
+  printNum: 0, // 	打印次数(后端要求传0，写死)
+  printStatus: '3', // 	可打印状态--(后端要求传3，写死)
   sampleId: '', // 	样品id
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   remark: '', // 证书报告备注
   templateId: '', // 证书报告模板id
   templateName: '', // 证书报告模板名称
-  businessOriginalRecord: {
+  certifications: '', // 证书类别--用于传参
+  businessOriginalRecord: { // 原始记录下的内容
     calibrationPlace: '', // 检校地点
-    originalRecordNo: '', // 原始记录编号
+    originalRecordCode: '', // 原始记录编号
     businessEnvironmentRecord: { // 环境记录单
       temperature: '', // 环境记录单温度
       humidity: '', // 环境记录单相对湿度
@@ -114,60 +109,74 @@
       customerAddress: '', // 委托方地址
       planDeliverTime: '', // 预计送达时间
       requireOverTime: '', // 要求检完时间
+      certifications: '', // 证书类别
     },
+    equipmentInfoList: [] as any, // 测量设备
+    fileList: [] as any, // 技术文件
   } as any, // 原始记录
-  equipmentInfoList: [] as any, // 测量设备
-  fileList: [] as any, // 技术文件
-})
 
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-interface standardOwnerOptionsType {
-  id: string
-  name: string
-}
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-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 standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  infoId.value = $route.params.id as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
   }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  if ($route.query.from) {
+    from.value = $route.query.from as string
+  }
+  if ($route.query.processId) {
+    formInline.value.processId = $route.query.processId as string
+  }
 }
+
+// 表单验证规则
+const rules = ref({
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书报告名称不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportType': [{ required: true, message: '证书报告类型不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'expirationDate': [{ required: true, message: '有效日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordCode': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationClass')
+  certificationClassMap.value = resCertificationClass.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+
+const approvalDialog = ref()
+
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -261,7 +270,6 @@
   },
 ])
 
-getStandardOwnerOptions()
 // 初始化路由
 const $router = useRouter()
 
@@ -269,29 +277,6 @@
 const close = () => {
   $router.back()
 }
-// 表单验证规则
-const rules = ref({
-  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
-  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
-})
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -317,26 +302,6 @@
   fileRef.value.click()
 }
 
-// 获取详情信息
-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.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
-      item.choose = true
-      return item
-    })
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -374,22 +339,22 @@
   }
 }
 
-// 保存后的id
+// 保存后的id，用于提交
 const addId = ref('')
-// 点击顶部一排按钮
+// 保存、提交、关闭
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') { // 新建的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       if (valid) {
         ElMessageBox.confirm('确认保存吗？', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-          getStandardLisAdd(fromListInfo.value).then((res) => {
+          addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -399,23 +364,33 @@
       }
     })
   }
-  else if (item === '保存' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') { // 编辑的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       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
-            }
-          })
+          if (from.value === 'caogao') { // 草稿箱编辑
+            draftUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else if (from.value === 'reject') { // 未通过-驳回编辑
+            failUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         })
       }
     })
@@ -425,11 +400,12 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({
+      submitReport({
         id: addId.value,
-        formId: formId.value,
+        formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
       }).then((res) => {
         if (res.code === 200) {
+          ElMessage.success('已提交')
           close()
         }
       })
@@ -439,34 +415,9 @@
     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 = () => {}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -483,143 +434,114 @@
 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()
-      }
-    })
+const getInfo = () => {
+  getReportDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
+    if (res.data.businessOriginalRecord.equipmentInfoList && res.data.businessOriginalRecord.equipmentInfoList.length) {
+      formInline.value.businessOriginalRecord.equipmentInfoList = res.data.businessOriginalRecord.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    }
+    else {
+      formInline.value.businessOriginalRecord.equipmentInfoList = []
+    }
+    formInline.value.businessOriginalRecord.fileList = res.data.businessOriginalRecord.fileList || []
   })
 }
 
-// ----------------------------------------所用设备-------------------------------------
-// 点击所用设备增加行
-const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  formInline.value.equipmentInfoList.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    validDate: '', // 有效日期
-    manufacturingNo: '', // 出厂编号
-  })
-}
-
-const handleSelectionChangeMeasureDevice = (e: any) => {
-  checkoutMeasureDeviceList.value = e
-}
-
-// 点击所用设备删除行
-const delMeasureDeviceRow = () => {
-  if (checkoutMeasureDeviceList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
     })
   }
   else {
-    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.equipmentInfoList.splice(index, 1)
-        }
-      })
-    })
+    ElMessage.warning('流程实例id为空')
   }
 }
 
-// 点击选择测量设备编号
-const handleClickMeasureDevice = (index: number) => {
-  measureDeviceVisible.value = true
-  selectIndex.value = index
-}
-// 修改测量设备对话框显隐
-const changeMeasureDeviceVisible = (val: boolean) => {
-  measureDeviceVisible.value = val
-}
-// 选好测量设备
-const confirmCheckoutMeasureDevice = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
-  }
+// -------------------------------------------原始记录------------------------------------
+// 点击选择原始记录编号
+const handleClickPrimitiveLog = () => {
+  primitiveLogVisible.value = true
 }
 
-// ------------------------------------------技术文件----------------------------------
-// 点击技术文件增加行
-const addFilesRow = () => {
-  console.log(formInline.value.fileList)
+// 修改原始记录对话框显隐
+const changePrimitiveLogVisible = (val: boolean) => {
+  primitiveLogVisible.value = val
+}
+// 选好原始记录
+const confirmCheckoutPrimitiveLog = (val: any) => {
+  console.log(val)
 
-  const index = formInline.value.fileList.findIndex((item: fileListType) =>
-    !item.fileNo && !item.fileName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条文件信息')
-    return
-  }
-  formInline.value.fileList.push({
-    fileNo: '', // 编号
-    fileName: '', // 名称
-    fileCode: '', // 文件号
-  })
+  formInline.value.businessOriginalRecord = val
+  formInline.value.certifications = val.businessOrder.certifications // 证书类别
+  formInline.value.certificateReportCategory = val.businessOrder.certifications // 证书类别
+  formInline.value.sampleId = val.customerSampleInfo.id // 样品id
+  formInline.value.orderId = val.businessOrder.id // 委托书id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+}
+// --------------------------------------证书报告模板-----------------------------------
+// 选择证书报告模板Ref
+const templateDialog = ref()
+// 选择证书报告模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书报告模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  formInline.value.templateId = val.id // 证书报告模板id
+  formInline.value.templateName = val.templateName || '' // 证书报告模板名称
 }
 
-// 技术文件表格多选
-const handleSelectionChangeFiles = (e: any) => {
-  checkoutFilesList.value = e
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
 }
-// 点击技术文件删除行
-const delFilesRow = () => {
-  if (checkoutFilesList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutFilesList.value.forEach((item: fileListType) => {
-      formInline.value.fileList.forEach((element: fileListType, index: number) => {
-        if (element.fileNo === item.fileNo) {
-          formInline.value.fileList.splice(index, 1)
-        }
-      })
-    })
-  }
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  formInline.value.signId = val.id // 电子签章id
+  formInline.value.signName = val.signName || '' // 电子签章名称
 }
 
-// 点击选择文件编号
-const handleClickFiles = (index: number) => {
-  filesVisible.value = true
-  selectFliesIndex.value = index
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
 }
-// 修改技术文件对话框显隐
-const changeFilesVisible = (val: boolean) => {
-  filesVisible.value = val
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  formInline.value.approvalSignId = val.id // 认可标志专用章id
+  formInline.value.approvalSignName = val.signName || '' // 认可标志专用章名称
 }
-// 选好测量设备
-const confirmCheckoutFiles = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
-    }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
-  }
-}
-
 // -------------------------------------------底部-------------------------------------------
+
+onMounted(() => {
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情
+    formInline.value.taskId = JSON.parse($route.query.row as string).taskId // 任务id（同意、驳回等操作使用）
+    formInline.value.processId = JSON.parse($route.query.row as string).processId // 流程实例id
+    formInline.value.processInstanceId = JSON.parse($route.query.row as string).processInstanceId // 流程实例id（取消操作使用）
+    approvalStatusName.value = JSON.parse($route.query.row as string).approvalStatusName
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord(formInline.value.processId) // 查询审批记录
+    }
+  }
+})
 </script>
 
 <template>
@@ -647,6 +569,28 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="证书报告编号:">
+              <el-input
+                v-model.trim="formInline.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="formInline.certificateReportName"
+                :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="calibrationMajor">
               <el-select
                 v-model="formInline.calibrationMajor"
@@ -657,10 +601,10 @@
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -680,27 +624,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:" prop="certificateReportCode">
-              <el-input
-                v-model.trim="formInline.certificateReportCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
-                class="full-width-input"
+            <el-form-item label="有效日期:" prop="expirationDate">
+              <el-date-picker
+                v-model="formInline.expirationDate"
+                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="certificateReportName">
-              <el-input
-                v-model.trim="formInline.certificateReportName"
-                :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="templateName">
               <el-input
@@ -710,9 +647,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickTemplate">
                     选择
                   </el-button>
                 </template>
@@ -720,6 +655,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="证书报告类型:" prop="certificateReportType">
+              <el-select
+                v-model="formInline.certificateReportType"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in certificationClassMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="电子签章:" prop="signName">
               <el-input
                 v-model.trim="formInline.signName"
@@ -728,9 +682,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSignature">
                     选择
                   </el-button>
                 </template>
@@ -746,9 +698,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSpecialSignature">
                     选择
                   </el-button>
                 </template>
@@ -756,17 +706,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
+            <el-form-item label="原始记录编号:">
               <el-input
-                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickPrimitiveLog">
                     选择
                   </el-button>
                 </template>
@@ -774,136 +721,142 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
+            <el-form-item label="检校地点:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
-                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
+            <el-form-item label="温度(℃):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
+            <el-form-item label="相对湿度(%):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
+            <el-form-item label="样品编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
+            <el-form-item label="样品名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
+            <el-form-item label="出厂编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
+            <el-form-item label="型号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
+            <el-form-item label="委托方代码:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
+            <el-form-item label="委托方名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
+            <el-form-item label="委托方电话:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
+              <el-select
+                v-model="formInline.businessOriginalRecord.businessOrder.certifications"
+                clearable
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
+            <el-form-item label="委托方地址:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -913,10 +866,9 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -924,10 +876,9 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
-                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -938,10 +889,9 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -951,24 +901,22 @@
                 v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
+            <el-form-item label="检定项目:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -1001,29 +949,11 @@
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
-          增加行
-        </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="delMeasureDeviceRow"
-        >
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.equipmentInfoList"
+        :data="formInline.businessOriginalRecord.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeMeasureDevice"
       >
-        <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"
@@ -1032,54 +962,15 @@
           :label="item.text"
           :width="item.width"
           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"
-                  type="primary"
-                  @click="handleClickMeasureDevice(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="addFilesRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="delFilesRow">
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.fileList"
+        :data="formInline.businessOriginalRecord.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeFiles"
       >
-        <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"
@@ -1088,59 +979,24 @@
           :label="item.text"
           :width="item.width"
           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="handleClickFiles(scope.$index)"
-                >
-                  选择
-                </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>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
-  <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <!-- 选择原始记录 -->
+  <select-primitive-log-list v-model:visible="primitiveLogVisible" @confirm-checkout="confirmCheckoutPrimitiveLog" @change-visible="changePrimitiveLogVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择签章 -->
+  <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+  <!-- 选择认可标志专用签章 -->
+  <select-signature ref="specialSignatureDialog" @add="confirmCheckoutSpecialSignature" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 4f29225..21b9831 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -35,6 +35,7 @@
   ],
   未通过: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
   已取消: [
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 0cfcb0e..207663f 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -6,14 +6,19 @@
 import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
+import {
+  approvalDeleteReport,
+  draftDeleteReport,
+  exportReportList,
+  getReportList,
+  submitReport,
+} from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval } from '@/api/approval'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-
 const props = defineProps({
   status: {
     type: String,
@@ -48,17 +53,17 @@
 const total = ref(0)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'certificateReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
-  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -94,12 +99,6 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const buttonTypeMap = ref('')
 
 // 点击删除
 const handleDelete = (row: IList) => {
@@ -112,15 +111,28 @@
       type: 'warning',
     },
   ).then(() => {
-    deleteReportList({ id: row.id }).then((res) => {
-      if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-        fetchData(true)
-      }
-    })
+    if (row.approvalStatusName === '草稿箱') {
+      draftDeleteReport({ ids: [row.id] }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else { // 除草稿箱之外的删除，审批删除
+      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
   })
 }
 // 取消
@@ -213,8 +225,22 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
-  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
+const goDetail = (row: any, pageType: 'detail' | 'edit') => {
+  let from = ''
+  if (row.approvalStatusName === '草稿箱') {
+    from = 'caogao'
+  }
+  else {
+    from = 'reject'
+  }
+  $router.push({
+    path: `/lab/reportOnCredentialsApproval/${pageType}/${row.id}`,
+    query: {
+      from,
+      processId: row.processId,
+      row: JSON.stringify(row),
+    },
+  })
 }
 // 新建证书报告
 const add = () => {
@@ -236,7 +262,10 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
+    submitReport({
+      id: row.id,
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    }).then((res) => {
       if (res.code === 200) {
         ElMessage.success('已提交')
         fetchData(true)
@@ -373,6 +402,7 @@
                 :key="index"
                 size="small"
                 :type="item.type" link
+                :disabled="row.approvalStatusName !== '未通过-驳回' && item.name === '编辑'"
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 39efdb5..b0b0037 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -316,13 +316,13 @@
 }
 
 // --------------------------------------原始记录模板-----------------------------------
-// 选择环境记录单Ref
+// 选择原始记录模板Ref
 const templateDialog = ref()
-// 选择环境记录单
+// 选择原始记录模板
 const handleClickTemplate = () => {
   templateDialog.value.initDialog()
 }
-// 选择环境记录单表格确认
+// 选择原始记录模板确认
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
@@ -331,11 +331,13 @@
 // ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
+  if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+      !item.equipmentNo && !item.equipmentName)
+    if (index !== -1) {
+      ElMessage.warning('请完善上一条设备信息')
+      return
+    }
   }
   formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
@@ -469,12 +471,18 @@
   if (infoId.value) {
     getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
       formInline.value = res.data
-      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
-        }
-      })
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        formInline.value.equipmentInfoList = []
+      }
+      formInline.value.fileList = res.data.fileList || []
     })
   }
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c663f79..17040fc 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -4,11 +4,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, columnsType } from '../report_interface'
+import type { IFileList, columnsType, dictType } from '../report_interface'
 import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
 import SelectFiles from '../../components/selectFiles.vue'
+import selectPrimitiveLogList from '../../components/selectPrimitiveLogList.vue'
+import selectReportTemplate from '../../components/selectReportTemplate.vue'
+import selectSignature from '../../components/selectSignature.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -20,54 +24,45 @@
 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'
-import { addReport } from '@/api/business/lab/report'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import {
+  addReport,
+  draftUpdateReport,
+  failUpdateReport,
+  getReportDetail,
+  submitReport,
+} from '@/api/business/lab/report'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
 import type { fileListType } from '@/views/measure/file/file-interface'
+import { getDictByCode } from '@/api/system/dict'
 
 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: '查看',
 } // 字典
-const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
-const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
-const checkoutMeasureDeviceList = ref([]) // 所用设备多选
-const checkoutFilesList = ref([]) // 技术文件多选
-const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
-const filesVisible = ref(false) // 控制选择技术文件对话框显隐
-// 从路由中获取页面类型参数
+const primitiveLogVisible = ref(false) // 控制选择原始记录对话框显隐
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const certificationClassMap = ref<dictType[]>([]) // 证书报告类型
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type 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 from = ref('') // reject表示未通过驳回跳转过来的
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref({
+  taskId: '', // 任务id，用于审批
+  processId: '', // 	流程实例id
+  processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
   approvalSignId: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
-  approvalStatus: '', // 审批状态
+  approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
   calibrationMajorName: '', // 检校专业名称
+  certificateReportType: '', // 证书报告类型
   certificateReportCategory: '', // 证书类别
   certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
@@ -76,21 +71,21 @@
   issuanceDate: '', // 出具日期
   measureDeptId: '', // 检定部门id
   measurePersonId: '', // 检定人员
-  measureResult: '', // 检定结果
+  measureResult: '1', // 检定结果--(后端要求传1，写死)
   orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  printNum: '', // 	打印次数
-  printStatus: '', // 	可打印状态
-  processId: '', // 	流程实例id
+  printNum: 0, // 	打印次数(后端要求传0，写死)
+  printStatus: '3', // 	可打印状态--(后端要求传3，写死)
   sampleId: '', // 	样品id
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   remark: '', // 证书报告备注
   templateId: '', // 证书报告模板id
   templateName: '', // 证书报告模板名称
-  businessOriginalRecord: {
+  certifications: '', // 证书类别--用于传参
+  businessOriginalRecord: { // 原始记录下的内容
     calibrationPlace: '', // 检校地点
-    originalRecordNo: '', // 原始记录编号
+    originalRecordCode: '', // 原始记录编号
     businessEnvironmentRecord: { // 环境记录单
       temperature: '', // 环境记录单温度
       humidity: '', // 环境记录单相对湿度
@@ -114,60 +109,74 @@
       customerAddress: '', // 委托方地址
       planDeliverTime: '', // 预计送达时间
       requireOverTime: '', // 要求检完时间
+      certifications: '', // 证书类别
     },
+    equipmentInfoList: [] as any, // 测量设备
+    fileList: [] as any, // 技术文件
   } as any, // 原始记录
-  equipmentInfoList: [] as any, // 测量设备
-  fileList: [] as any, // 技术文件
-})
 
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-interface standardOwnerOptionsType {
-  id: string
-  name: string
-}
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-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 standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  infoId.value = $route.params.id as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
   }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  if ($route.query.from) {
+    from.value = $route.query.from as string
+  }
+  if ($route.query.processId) {
+    formInline.value.processId = $route.query.processId as string
+  }
 }
+
+// 表单验证规则
+const rules = ref({
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书报告名称不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportType': [{ required: true, message: '证书报告类型不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'expirationDate': [{ required: true, message: '有效日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordCode': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationClass')
+  certificationClassMap.value = resCertificationClass.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+
+const approvalDialog = ref()
+
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -261,7 +270,6 @@
   },
 ])
 
-getStandardOwnerOptions()
 // 初始化路由
 const $router = useRouter()
 
@@ -269,29 +277,6 @@
 const close = () => {
   $router.back()
 }
-// 表单验证规则
-const rules = ref({
-  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
-  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
-})
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -317,26 +302,6 @@
   fileRef.value.click()
 }
 
-// 获取详情信息
-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.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
-      item.choose = true
-      return item
-    })
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -374,22 +339,22 @@
   }
 }
 
-// 保存后的id
+// 保存后的id，用于提交
 const addId = ref('')
-// 点击顶部一排按钮
+// 保存、提交、关闭
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') { // 新建的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       if (valid) {
         ElMessageBox.confirm('确认保存吗？', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-          getStandardLisAdd(fromListInfo.value).then((res) => {
+          addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -399,23 +364,33 @@
       }
     })
   }
-  else if (item === '保存' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') { // 编辑的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       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
-            }
-          })
+          if (from.value === 'caogao') { // 草稿箱编辑
+            draftUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else if (from.value === 'reject') { // 未通过-驳回编辑
+            failUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         })
       }
     })
@@ -425,11 +400,12 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({
+      submitReport({
         id: addId.value,
-        formId: formId.value,
+        formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
       }).then((res) => {
         if (res.code === 200) {
+          ElMessage.success('已提交')
           close()
         }
       })
@@ -439,34 +415,9 @@
     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 = () => {}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -483,143 +434,114 @@
 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()
-      }
-    })
+const getInfo = () => {
+  getReportDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
+    if (res.data.businessOriginalRecord.equipmentInfoList && res.data.businessOriginalRecord.equipmentInfoList.length) {
+      formInline.value.businessOriginalRecord.equipmentInfoList = res.data.businessOriginalRecord.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    }
+    else {
+      formInline.value.businessOriginalRecord.equipmentInfoList = []
+    }
+    formInline.value.businessOriginalRecord.fileList = res.data.businessOriginalRecord.fileList || []
   })
 }
 
-// ----------------------------------------所用设备-------------------------------------
-// 点击所用设备增加行
-const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  formInline.value.equipmentInfoList.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    validDate: '', // 有效日期
-    manufacturingNo: '', // 出厂编号
-  })
-}
-
-const handleSelectionChangeMeasureDevice = (e: any) => {
-  checkoutMeasureDeviceList.value = e
-}
-
-// 点击所用设备删除行
-const delMeasureDeviceRow = () => {
-  if (checkoutMeasureDeviceList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
     })
   }
   else {
-    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.equipmentInfoList.splice(index, 1)
-        }
-      })
-    })
+    ElMessage.warning('流程实例id为空')
   }
 }
 
-// 点击选择测量设备编号
-const handleClickMeasureDevice = (index: number) => {
-  measureDeviceVisible.value = true
-  selectIndex.value = index
-}
-// 修改测量设备对话框显隐
-const changeMeasureDeviceVisible = (val: boolean) => {
-  measureDeviceVisible.value = val
-}
-// 选好测量设备
-const confirmCheckoutMeasureDevice = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
-  }
+// -------------------------------------------原始记录------------------------------------
+// 点击选择原始记录编号
+const handleClickPrimitiveLog = () => {
+  primitiveLogVisible.value = true
 }
 
-// ------------------------------------------技术文件----------------------------------
-// 点击技术文件增加行
-const addFilesRow = () => {
-  console.log(formInline.value.fileList)
+// 修改原始记录对话框显隐
+const changePrimitiveLogVisible = (val: boolean) => {
+  primitiveLogVisible.value = val
+}
+// 选好原始记录
+const confirmCheckoutPrimitiveLog = (val: any) => {
+  console.log(val)
 
-  const index = formInline.value.fileList.findIndex((item: fileListType) =>
-    !item.fileNo && !item.fileName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条文件信息')
-    return
-  }
-  formInline.value.fileList.push({
-    fileNo: '', // 编号
-    fileName: '', // 名称
-    fileCode: '', // 文件号
-  })
+  formInline.value.businessOriginalRecord = val
+  formInline.value.certifications = val.businessOrder.certifications // 证书类别
+  formInline.value.certificateReportCategory = val.businessOrder.certifications // 证书类别
+  formInline.value.sampleId = val.customerSampleInfo.id // 样品id
+  formInline.value.orderId = val.businessOrder.id // 委托书id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+}
+// --------------------------------------证书报告模板-----------------------------------
+// 选择证书报告模板Ref
+const templateDialog = ref()
+// 选择证书报告模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书报告模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  formInline.value.templateId = val.id // 证书报告模板id
+  formInline.value.templateName = val.templateName || '' // 证书报告模板名称
 }
 
-// 技术文件表格多选
-const handleSelectionChangeFiles = (e: any) => {
-  checkoutFilesList.value = e
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
 }
-// 点击技术文件删除行
-const delFilesRow = () => {
-  if (checkoutFilesList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutFilesList.value.forEach((item: fileListType) => {
-      formInline.value.fileList.forEach((element: fileListType, index: number) => {
-        if (element.fileNo === item.fileNo) {
-          formInline.value.fileList.splice(index, 1)
-        }
-      })
-    })
-  }
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  formInline.value.signId = val.id // 电子签章id
+  formInline.value.signName = val.signName || '' // 电子签章名称
 }
 
-// 点击选择文件编号
-const handleClickFiles = (index: number) => {
-  filesVisible.value = true
-  selectFliesIndex.value = index
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
 }
-// 修改技术文件对话框显隐
-const changeFilesVisible = (val: boolean) => {
-  filesVisible.value = val
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  formInline.value.approvalSignId = val.id // 认可标志专用章id
+  formInline.value.approvalSignName = val.signName || '' // 认可标志专用章名称
 }
-// 选好测量设备
-const confirmCheckoutFiles = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
-    }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
-  }
-}
-
 // -------------------------------------------底部-------------------------------------------
+
+onMounted(() => {
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情
+    formInline.value.taskId = JSON.parse($route.query.row as string).taskId // 任务id（同意、驳回等操作使用）
+    formInline.value.processId = JSON.parse($route.query.row as string).processId // 流程实例id
+    formInline.value.processInstanceId = JSON.parse($route.query.row as string).processInstanceId // 流程实例id（取消操作使用）
+    approvalStatusName.value = JSON.parse($route.query.row as string).approvalStatusName
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord(formInline.value.processId) // 查询审批记录
+    }
+  }
+})
 </script>
 
 <template>
@@ -647,6 +569,28 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="证书报告编号:">
+              <el-input
+                v-model.trim="formInline.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="formInline.certificateReportName"
+                :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="calibrationMajor">
               <el-select
                 v-model="formInline.calibrationMajor"
@@ -657,10 +601,10 @@
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -680,27 +624,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:" prop="certificateReportCode">
-              <el-input
-                v-model.trim="formInline.certificateReportCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
-                class="full-width-input"
+            <el-form-item label="有效日期:" prop="expirationDate">
+              <el-date-picker
+                v-model="formInline.expirationDate"
+                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="certificateReportName">
-              <el-input
-                v-model.trim="formInline.certificateReportName"
-                :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="templateName">
               <el-input
@@ -710,9 +647,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickTemplate">
                     选择
                   </el-button>
                 </template>
@@ -720,6 +655,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="证书报告类型:" prop="certificateReportType">
+              <el-select
+                v-model="formInline.certificateReportType"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in certificationClassMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="电子签章:" prop="signName">
               <el-input
                 v-model.trim="formInline.signName"
@@ -728,9 +682,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSignature">
                     选择
                   </el-button>
                 </template>
@@ -746,9 +698,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSpecialSignature">
                     选择
                   </el-button>
                 </template>
@@ -756,17 +706,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
+            <el-form-item label="原始记录编号:">
               <el-input
-                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickPrimitiveLog">
                     选择
                   </el-button>
                 </template>
@@ -774,136 +721,142 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
+            <el-form-item label="检校地点:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
-                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
+            <el-form-item label="温度(℃):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
+            <el-form-item label="相对湿度(%):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
+            <el-form-item label="样品编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
+            <el-form-item label="样品名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
+            <el-form-item label="出厂编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
+            <el-form-item label="型号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
+            <el-form-item label="委托方代码:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
+            <el-form-item label="委托方名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
+            <el-form-item label="委托方电话:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
+              <el-select
+                v-model="formInline.businessOriginalRecord.businessOrder.certifications"
+                clearable
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
+            <el-form-item label="委托方地址:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -913,10 +866,9 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -924,10 +876,9 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
-                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -938,10 +889,9 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -951,24 +901,22 @@
                 v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
+            <el-form-item label="检定项目:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -1001,29 +949,11 @@
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
-          增加行
-        </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="delMeasureDeviceRow"
-        >
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.equipmentInfoList"
+        :data="formInline.businessOriginalRecord.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeMeasureDevice"
       >
-        <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"
@@ -1032,54 +962,15 @@
           :label="item.text"
           :width="item.width"
           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"
-                  type="primary"
-                  @click="handleClickMeasureDevice(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="addFilesRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="delFilesRow">
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.fileList"
+        :data="formInline.businessOriginalRecord.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeFiles"
       >
-        <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"
@@ -1088,59 +979,24 @@
           :label="item.text"
           :width="item.width"
           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="handleClickFiles(scope.$index)"
-                >
-                  选择
-                </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>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
-  <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <!-- 选择原始记录 -->
+  <select-primitive-log-list v-model:visible="primitiveLogVisible" @confirm-checkout="confirmCheckoutPrimitiveLog" @change-visible="changePrimitiveLogVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择签章 -->
+  <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+  <!-- 选择认可标志专用签章 -->
+  <select-signature ref="specialSignatureDialog" @add="confirmCheckoutSpecialSignature" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 4f29225..21b9831 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -35,6 +35,7 @@
   ],
   未通过: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
   已取消: [
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 0cfcb0e..207663f 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -6,14 +6,19 @@
 import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
+import {
+  approvalDeleteReport,
+  draftDeleteReport,
+  exportReportList,
+  getReportList,
+  submitReport,
+} from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval } from '@/api/approval'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-
 const props = defineProps({
   status: {
     type: String,
@@ -48,17 +53,17 @@
 const total = ref(0)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'certificateReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
-  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -94,12 +99,6 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const buttonTypeMap = ref('')
 
 // 点击删除
 const handleDelete = (row: IList) => {
@@ -112,15 +111,28 @@
       type: 'warning',
     },
   ).then(() => {
-    deleteReportList({ id: row.id }).then((res) => {
-      if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-        fetchData(true)
-      }
-    })
+    if (row.approvalStatusName === '草稿箱') {
+      draftDeleteReport({ ids: [row.id] }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else { // 除草稿箱之外的删除，审批删除
+      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
   })
 }
 // 取消
@@ -213,8 +225,22 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
-  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
+const goDetail = (row: any, pageType: 'detail' | 'edit') => {
+  let from = ''
+  if (row.approvalStatusName === '草稿箱') {
+    from = 'caogao'
+  }
+  else {
+    from = 'reject'
+  }
+  $router.push({
+    path: `/lab/reportOnCredentialsApproval/${pageType}/${row.id}`,
+    query: {
+      from,
+      processId: row.processId,
+      row: JSON.stringify(row),
+    },
+  })
 }
 // 新建证书报告
 const add = () => {
@@ -236,7 +262,10 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
+    submitReport({
+      id: row.id,
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    }).then((res) => {
       if (res.code === 200) {
         ElMessage.success('已提交')
         fetchData(true)
@@ -373,6 +402,7 @@
                 :key="index"
                 size="small"
                 :type="item.type" link
+                :disabled="row.approvalStatusName !== '未通过-驳回' && item.name === '编辑'"
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 323bbf3..a8cd20d 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -119,3 +119,4 @@
   time: Boolean
   width?: string // 列宽
 }
+

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 39efdb5..b0b0037 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -316,13 +316,13 @@
 }
 
 // --------------------------------------原始记录模板-----------------------------------
-// 选择环境记录单Ref
+// 选择原始记录模板Ref
 const templateDialog = ref()
-// 选择环境记录单
+// 选择原始记录模板
 const handleClickTemplate = () => {
   templateDialog.value.initDialog()
 }
-// 选择环境记录单表格确认
+// 选择原始记录模板确认
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
@@ -331,11 +331,13 @@
 // ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
+  if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+      !item.equipmentNo && !item.equipmentName)
+    if (index !== -1) {
+      ElMessage.warning('请完善上一条设备信息')
+      return
+    }
   }
   formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
@@ -469,12 +471,18 @@
   if (infoId.value) {
     getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
       formInline.value = res.data
-      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
-        }
-      })
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        formInline.value.equipmentInfoList = []
+      }
+      formInline.value.fileList = res.data.fileList || []
     })
   }
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c663f79..17040fc 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -4,11 +4,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, columnsType } from '../report_interface'
+import type { IFileList, columnsType, dictType } from '../report_interface'
 import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
 import SelectFiles from '../../components/selectFiles.vue'
+import selectPrimitiveLogList from '../../components/selectPrimitiveLogList.vue'
+import selectReportTemplate from '../../components/selectReportTemplate.vue'
+import selectSignature from '../../components/selectSignature.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -20,54 +24,45 @@
 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'
-import { addReport } from '@/api/business/lab/report'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import {
+  addReport,
+  draftUpdateReport,
+  failUpdateReport,
+  getReportDetail,
+  submitReport,
+} from '@/api/business/lab/report'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
 import type { fileListType } from '@/views/measure/file/file-interface'
+import { getDictByCode } from '@/api/system/dict'
 
 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: '查看',
 } // 字典
-const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
-const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
-const checkoutMeasureDeviceList = ref([]) // 所用设备多选
-const checkoutFilesList = ref([]) // 技术文件多选
-const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
-const filesVisible = ref(false) // 控制选择技术文件对话框显隐
-// 从路由中获取页面类型参数
+const primitiveLogVisible = ref(false) // 控制选择原始记录对话框显隐
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const certificationClassMap = ref<dictType[]>([]) // 证书报告类型
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type 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 from = ref('') // reject表示未通过驳回跳转过来的
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref({
+  taskId: '', // 任务id，用于审批
+  processId: '', // 	流程实例id
+  processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
   approvalSignId: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
-  approvalStatus: '', // 审批状态
+  approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
   calibrationMajorName: '', // 检校专业名称
+  certificateReportType: '', // 证书报告类型
   certificateReportCategory: '', // 证书类别
   certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
@@ -76,21 +71,21 @@
   issuanceDate: '', // 出具日期
   measureDeptId: '', // 检定部门id
   measurePersonId: '', // 检定人员
-  measureResult: '', // 检定结果
+  measureResult: '1', // 检定结果--(后端要求传1，写死)
   orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  printNum: '', // 	打印次数
-  printStatus: '', // 	可打印状态
-  processId: '', // 	流程实例id
+  printNum: 0, // 	打印次数(后端要求传0，写死)
+  printStatus: '3', // 	可打印状态--(后端要求传3，写死)
   sampleId: '', // 	样品id
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   remark: '', // 证书报告备注
   templateId: '', // 证书报告模板id
   templateName: '', // 证书报告模板名称
-  businessOriginalRecord: {
+  certifications: '', // 证书类别--用于传参
+  businessOriginalRecord: { // 原始记录下的内容
     calibrationPlace: '', // 检校地点
-    originalRecordNo: '', // 原始记录编号
+    originalRecordCode: '', // 原始记录编号
     businessEnvironmentRecord: { // 环境记录单
       temperature: '', // 环境记录单温度
       humidity: '', // 环境记录单相对湿度
@@ -114,60 +109,74 @@
       customerAddress: '', // 委托方地址
       planDeliverTime: '', // 预计送达时间
       requireOverTime: '', // 要求检完时间
+      certifications: '', // 证书类别
     },
+    equipmentInfoList: [] as any, // 测量设备
+    fileList: [] as any, // 技术文件
   } as any, // 原始记录
-  equipmentInfoList: [] as any, // 测量设备
-  fileList: [] as any, // 技术文件
-})
 
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-interface standardOwnerOptionsType {
-  id: string
-  name: string
-}
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-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 standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  infoId.value = $route.params.id as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
   }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  if ($route.query.from) {
+    from.value = $route.query.from as string
+  }
+  if ($route.query.processId) {
+    formInline.value.processId = $route.query.processId as string
+  }
 }
+
+// 表单验证规则
+const rules = ref({
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书报告名称不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportType': [{ required: true, message: '证书报告类型不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'expirationDate': [{ required: true, message: '有效日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordCode': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationClass')
+  certificationClassMap.value = resCertificationClass.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+
+const approvalDialog = ref()
+
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -261,7 +270,6 @@
   },
 ])
 
-getStandardOwnerOptions()
 // 初始化路由
 const $router = useRouter()
 
@@ -269,29 +277,6 @@
 const close = () => {
   $router.back()
 }
-// 表单验证规则
-const rules = ref({
-  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
-  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
-})
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -317,26 +302,6 @@
   fileRef.value.click()
 }
 
-// 获取详情信息
-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.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
-      item.choose = true
-      return item
-    })
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -374,22 +339,22 @@
   }
 }
 
-// 保存后的id
+// 保存后的id，用于提交
 const addId = ref('')
-// 点击顶部一排按钮
+// 保存、提交、关闭
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') { // 新建的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       if (valid) {
         ElMessageBox.confirm('确认保存吗？', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-          getStandardLisAdd(fromListInfo.value).then((res) => {
+          addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -399,23 +364,33 @@
       }
     })
   }
-  else if (item === '保存' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') { // 编辑的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       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
-            }
-          })
+          if (from.value === 'caogao') { // 草稿箱编辑
+            draftUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else if (from.value === 'reject') { // 未通过-驳回编辑
+            failUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         })
       }
     })
@@ -425,11 +400,12 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({
+      submitReport({
         id: addId.value,
-        formId: formId.value,
+        formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
       }).then((res) => {
         if (res.code === 200) {
+          ElMessage.success('已提交')
           close()
         }
       })
@@ -439,34 +415,9 @@
     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 = () => {}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -483,143 +434,114 @@
 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()
-      }
-    })
+const getInfo = () => {
+  getReportDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
+    if (res.data.businessOriginalRecord.equipmentInfoList && res.data.businessOriginalRecord.equipmentInfoList.length) {
+      formInline.value.businessOriginalRecord.equipmentInfoList = res.data.businessOriginalRecord.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    }
+    else {
+      formInline.value.businessOriginalRecord.equipmentInfoList = []
+    }
+    formInline.value.businessOriginalRecord.fileList = res.data.businessOriginalRecord.fileList || []
   })
 }
 
-// ----------------------------------------所用设备-------------------------------------
-// 点击所用设备增加行
-const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  formInline.value.equipmentInfoList.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    validDate: '', // 有效日期
-    manufacturingNo: '', // 出厂编号
-  })
-}
-
-const handleSelectionChangeMeasureDevice = (e: any) => {
-  checkoutMeasureDeviceList.value = e
-}
-
-// 点击所用设备删除行
-const delMeasureDeviceRow = () => {
-  if (checkoutMeasureDeviceList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
     })
   }
   else {
-    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.equipmentInfoList.splice(index, 1)
-        }
-      })
-    })
+    ElMessage.warning('流程实例id为空')
   }
 }
 
-// 点击选择测量设备编号
-const handleClickMeasureDevice = (index: number) => {
-  measureDeviceVisible.value = true
-  selectIndex.value = index
-}
-// 修改测量设备对话框显隐
-const changeMeasureDeviceVisible = (val: boolean) => {
-  measureDeviceVisible.value = val
-}
-// 选好测量设备
-const confirmCheckoutMeasureDevice = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
-  }
+// -------------------------------------------原始记录------------------------------------
+// 点击选择原始记录编号
+const handleClickPrimitiveLog = () => {
+  primitiveLogVisible.value = true
 }
 
-// ------------------------------------------技术文件----------------------------------
-// 点击技术文件增加行
-const addFilesRow = () => {
-  console.log(formInline.value.fileList)
+// 修改原始记录对话框显隐
+const changePrimitiveLogVisible = (val: boolean) => {
+  primitiveLogVisible.value = val
+}
+// 选好原始记录
+const confirmCheckoutPrimitiveLog = (val: any) => {
+  console.log(val)
 
-  const index = formInline.value.fileList.findIndex((item: fileListType) =>
-    !item.fileNo && !item.fileName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条文件信息')
-    return
-  }
-  formInline.value.fileList.push({
-    fileNo: '', // 编号
-    fileName: '', // 名称
-    fileCode: '', // 文件号
-  })
+  formInline.value.businessOriginalRecord = val
+  formInline.value.certifications = val.businessOrder.certifications // 证书类别
+  formInline.value.certificateReportCategory = val.businessOrder.certifications // 证书类别
+  formInline.value.sampleId = val.customerSampleInfo.id // 样品id
+  formInline.value.orderId = val.businessOrder.id // 委托书id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+}
+// --------------------------------------证书报告模板-----------------------------------
+// 选择证书报告模板Ref
+const templateDialog = ref()
+// 选择证书报告模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书报告模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  formInline.value.templateId = val.id // 证书报告模板id
+  formInline.value.templateName = val.templateName || '' // 证书报告模板名称
 }
 
-// 技术文件表格多选
-const handleSelectionChangeFiles = (e: any) => {
-  checkoutFilesList.value = e
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
 }
-// 点击技术文件删除行
-const delFilesRow = () => {
-  if (checkoutFilesList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutFilesList.value.forEach((item: fileListType) => {
-      formInline.value.fileList.forEach((element: fileListType, index: number) => {
-        if (element.fileNo === item.fileNo) {
-          formInline.value.fileList.splice(index, 1)
-        }
-      })
-    })
-  }
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  formInline.value.signId = val.id // 电子签章id
+  formInline.value.signName = val.signName || '' // 电子签章名称
 }
 
-// 点击选择文件编号
-const handleClickFiles = (index: number) => {
-  filesVisible.value = true
-  selectFliesIndex.value = index
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
 }
-// 修改技术文件对话框显隐
-const changeFilesVisible = (val: boolean) => {
-  filesVisible.value = val
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  formInline.value.approvalSignId = val.id // 认可标志专用章id
+  formInline.value.approvalSignName = val.signName || '' // 认可标志专用章名称
 }
-// 选好测量设备
-const confirmCheckoutFiles = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
-    }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
-  }
-}
-
 // -------------------------------------------底部-------------------------------------------
+
+onMounted(() => {
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情
+    formInline.value.taskId = JSON.parse($route.query.row as string).taskId // 任务id（同意、驳回等操作使用）
+    formInline.value.processId = JSON.parse($route.query.row as string).processId // 流程实例id
+    formInline.value.processInstanceId = JSON.parse($route.query.row as string).processInstanceId // 流程实例id（取消操作使用）
+    approvalStatusName.value = JSON.parse($route.query.row as string).approvalStatusName
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord(formInline.value.processId) // 查询审批记录
+    }
+  }
+})
 </script>
 
 <template>
@@ -647,6 +569,28 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="证书报告编号:">
+              <el-input
+                v-model.trim="formInline.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="formInline.certificateReportName"
+                :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="calibrationMajor">
               <el-select
                 v-model="formInline.calibrationMajor"
@@ -657,10 +601,10 @@
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -680,27 +624,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:" prop="certificateReportCode">
-              <el-input
-                v-model.trim="formInline.certificateReportCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
-                class="full-width-input"
+            <el-form-item label="有效日期:" prop="expirationDate">
+              <el-date-picker
+                v-model="formInline.expirationDate"
+                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="certificateReportName">
-              <el-input
-                v-model.trim="formInline.certificateReportName"
-                :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="templateName">
               <el-input
@@ -710,9 +647,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickTemplate">
                     选择
                   </el-button>
                 </template>
@@ -720,6 +655,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="证书报告类型:" prop="certificateReportType">
+              <el-select
+                v-model="formInline.certificateReportType"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in certificationClassMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="电子签章:" prop="signName">
               <el-input
                 v-model.trim="formInline.signName"
@@ -728,9 +682,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSignature">
                     选择
                   </el-button>
                 </template>
@@ -746,9 +698,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSpecialSignature">
                     选择
                   </el-button>
                 </template>
@@ -756,17 +706,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
+            <el-form-item label="原始记录编号:">
               <el-input
-                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickPrimitiveLog">
                     选择
                   </el-button>
                 </template>
@@ -774,136 +721,142 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
+            <el-form-item label="检校地点:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
-                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
+            <el-form-item label="温度(℃):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
+            <el-form-item label="相对湿度(%):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
+            <el-form-item label="样品编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
+            <el-form-item label="样品名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
+            <el-form-item label="出厂编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
+            <el-form-item label="型号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
+            <el-form-item label="委托方代码:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
+            <el-form-item label="委托方名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
+            <el-form-item label="委托方电话:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
+              <el-select
+                v-model="formInline.businessOriginalRecord.businessOrder.certifications"
+                clearable
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
+            <el-form-item label="委托方地址:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -913,10 +866,9 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -924,10 +876,9 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
-                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -938,10 +889,9 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -951,24 +901,22 @@
                 v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
+            <el-form-item label="检定项目:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -1001,29 +949,11 @@
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
-          增加行
-        </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="delMeasureDeviceRow"
-        >
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.equipmentInfoList"
+        :data="formInline.businessOriginalRecord.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeMeasureDevice"
       >
-        <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"
@@ -1032,54 +962,15 @@
           :label="item.text"
           :width="item.width"
           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"
-                  type="primary"
-                  @click="handleClickMeasureDevice(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="addFilesRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="delFilesRow">
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.fileList"
+        :data="formInline.businessOriginalRecord.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeFiles"
       >
-        <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"
@@ -1088,59 +979,24 @@
           :label="item.text"
           :width="item.width"
           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="handleClickFiles(scope.$index)"
-                >
-                  选择
-                </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>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
-  <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <!-- 选择原始记录 -->
+  <select-primitive-log-list v-model:visible="primitiveLogVisible" @confirm-checkout="confirmCheckoutPrimitiveLog" @change-visible="changePrimitiveLogVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择签章 -->
+  <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+  <!-- 选择认可标志专用签章 -->
+  <select-signature ref="specialSignatureDialog" @add="confirmCheckoutSpecialSignature" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 4f29225..21b9831 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -35,6 +35,7 @@
   ],
   未通过: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
   已取消: [
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 0cfcb0e..207663f 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -6,14 +6,19 @@
 import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
+import {
+  approvalDeleteReport,
+  draftDeleteReport,
+  exportReportList,
+  getReportList,
+  submitReport,
+} from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval } from '@/api/approval'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-
 const props = defineProps({
   status: {
     type: String,
@@ -48,17 +53,17 @@
 const total = ref(0)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'certificateReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
-  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -94,12 +99,6 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const buttonTypeMap = ref('')
 
 // 点击删除
 const handleDelete = (row: IList) => {
@@ -112,15 +111,28 @@
       type: 'warning',
     },
   ).then(() => {
-    deleteReportList({ id: row.id }).then((res) => {
-      if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-        fetchData(true)
-      }
-    })
+    if (row.approvalStatusName === '草稿箱') {
+      draftDeleteReport({ ids: [row.id] }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else { // 除草稿箱之外的删除，审批删除
+      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
   })
 }
 // 取消
@@ -213,8 +225,22 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
-  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
+const goDetail = (row: any, pageType: 'detail' | 'edit') => {
+  let from = ''
+  if (row.approvalStatusName === '草稿箱') {
+    from = 'caogao'
+  }
+  else {
+    from = 'reject'
+  }
+  $router.push({
+    path: `/lab/reportOnCredentialsApproval/${pageType}/${row.id}`,
+    query: {
+      from,
+      processId: row.processId,
+      row: JSON.stringify(row),
+    },
+  })
 }
 // 新建证书报告
 const add = () => {
@@ -236,7 +262,10 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
+    submitReport({
+      id: row.id,
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    }).then((res) => {
       if (res.code === 200) {
         ElMessage.success('已提交')
         fetchData(true)
@@ -373,6 +402,7 @@
                 :key="index"
                 size="small"
                 :type="item.type" link
+                :disabled="row.approvalStatusName !== '未通过-驳回' && item.name === '编辑'"
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 323bbf3..a8cd20d 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -119,3 +119,4 @@
   time: Boolean
   width?: string // 列宽
 }
+
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index acbf354..34a2da6 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -121,9 +121,9 @@
 // 获取检定证书
 const fetchCertifications = (query = null) => {
   if (pageType.value === 'detail') {
-    getCertification({ id: infoId.value }).then((res) => {
-      dataList.value.certificationRecords = res.data.rows
-    })
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
   }
 }
 
@@ -483,7 +483,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="检定周期:" prop="measurePeriod">
+              <el-form-item label="检定周期（月）:" prop="measurePeriod">
                 <el-input
                   v-model="dataForm.measurePeriod"
                   :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 39efdb5..b0b0037 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -316,13 +316,13 @@
 }
 
 // --------------------------------------原始记录模板-----------------------------------
-// 选择环境记录单Ref
+// 选择原始记录模板Ref
 const templateDialog = ref()
-// 选择环境记录单
+// 选择原始记录模板
 const handleClickTemplate = () => {
   templateDialog.value.initDialog()
 }
-// 选择环境记录单表格确认
+// 选择原始记录模板确认
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
@@ -331,11 +331,13 @@
 // ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
+  if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+      !item.equipmentNo && !item.equipmentName)
+    if (index !== -1) {
+      ElMessage.warning('请完善上一条设备信息')
+      return
+    }
   }
   formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
@@ -469,12 +471,18 @@
   if (infoId.value) {
     getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
       formInline.value = res.data
-      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
-        }
-      })
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        formInline.value.equipmentInfoList = []
+      }
+      formInline.value.fileList = res.data.fileList || []
     })
   }
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c663f79..17040fc 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -4,11 +4,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, columnsType } from '../report_interface'
+import type { IFileList, columnsType, dictType } from '../report_interface'
 import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
 import SelectFiles from '../../components/selectFiles.vue'
+import selectPrimitiveLogList from '../../components/selectPrimitiveLogList.vue'
+import selectReportTemplate from '../../components/selectReportTemplate.vue'
+import selectSignature from '../../components/selectSignature.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -20,54 +24,45 @@
 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'
-import { addReport } from '@/api/business/lab/report'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import {
+  addReport,
+  draftUpdateReport,
+  failUpdateReport,
+  getReportDetail,
+  submitReport,
+} from '@/api/business/lab/report'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
 import type { fileListType } from '@/views/measure/file/file-interface'
+import { getDictByCode } from '@/api/system/dict'
 
 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: '查看',
 } // 字典
-const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
-const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
-const checkoutMeasureDeviceList = ref([]) // 所用设备多选
-const checkoutFilesList = ref([]) // 技术文件多选
-const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
-const filesVisible = ref(false) // 控制选择技术文件对话框显隐
-// 从路由中获取页面类型参数
+const primitiveLogVisible = ref(false) // 控制选择原始记录对话框显隐
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const certificationClassMap = ref<dictType[]>([]) // 证书报告类型
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type 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 from = ref('') // reject表示未通过驳回跳转过来的
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref({
+  taskId: '', // 任务id，用于审批
+  processId: '', // 	流程实例id
+  processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
   approvalSignId: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
-  approvalStatus: '', // 审批状态
+  approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
   calibrationMajorName: '', // 检校专业名称
+  certificateReportType: '', // 证书报告类型
   certificateReportCategory: '', // 证书类别
   certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
@@ -76,21 +71,21 @@
   issuanceDate: '', // 出具日期
   measureDeptId: '', // 检定部门id
   measurePersonId: '', // 检定人员
-  measureResult: '', // 检定结果
+  measureResult: '1', // 检定结果--(后端要求传1，写死)
   orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  printNum: '', // 	打印次数
-  printStatus: '', // 	可打印状态
-  processId: '', // 	流程实例id
+  printNum: 0, // 	打印次数(后端要求传0，写死)
+  printStatus: '3', // 	可打印状态--(后端要求传3，写死)
   sampleId: '', // 	样品id
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   remark: '', // 证书报告备注
   templateId: '', // 证书报告模板id
   templateName: '', // 证书报告模板名称
-  businessOriginalRecord: {
+  certifications: '', // 证书类别--用于传参
+  businessOriginalRecord: { // 原始记录下的内容
     calibrationPlace: '', // 检校地点
-    originalRecordNo: '', // 原始记录编号
+    originalRecordCode: '', // 原始记录编号
     businessEnvironmentRecord: { // 环境记录单
       temperature: '', // 环境记录单温度
       humidity: '', // 环境记录单相对湿度
@@ -114,60 +109,74 @@
       customerAddress: '', // 委托方地址
       planDeliverTime: '', // 预计送达时间
       requireOverTime: '', // 要求检完时间
+      certifications: '', // 证书类别
     },
+    equipmentInfoList: [] as any, // 测量设备
+    fileList: [] as any, // 技术文件
   } as any, // 原始记录
-  equipmentInfoList: [] as any, // 测量设备
-  fileList: [] as any, // 技术文件
-})
 
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-interface standardOwnerOptionsType {
-  id: string
-  name: string
-}
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-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 standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  infoId.value = $route.params.id as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
   }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  if ($route.query.from) {
+    from.value = $route.query.from as string
+  }
+  if ($route.query.processId) {
+    formInline.value.processId = $route.query.processId as string
+  }
 }
+
+// 表单验证规则
+const rules = ref({
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书报告名称不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportType': [{ required: true, message: '证书报告类型不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'expirationDate': [{ required: true, message: '有效日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordCode': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationClass')
+  certificationClassMap.value = resCertificationClass.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+
+const approvalDialog = ref()
+
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -261,7 +270,6 @@
   },
 ])
 
-getStandardOwnerOptions()
 // 初始化路由
 const $router = useRouter()
 
@@ -269,29 +277,6 @@
 const close = () => {
   $router.back()
 }
-// 表单验证规则
-const rules = ref({
-  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
-  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
-})
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -317,26 +302,6 @@
   fileRef.value.click()
 }
 
-// 获取详情信息
-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.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
-      item.choose = true
-      return item
-    })
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -374,22 +339,22 @@
   }
 }
 
-// 保存后的id
+// 保存后的id，用于提交
 const addId = ref('')
-// 点击顶部一排按钮
+// 保存、提交、关闭
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') { // 新建的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       if (valid) {
         ElMessageBox.confirm('确认保存吗？', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-          getStandardLisAdd(fromListInfo.value).then((res) => {
+          addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -399,23 +364,33 @@
       }
     })
   }
-  else if (item === '保存' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') { // 编辑的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       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
-            }
-          })
+          if (from.value === 'caogao') { // 草稿箱编辑
+            draftUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else if (from.value === 'reject') { // 未通过-驳回编辑
+            failUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         })
       }
     })
@@ -425,11 +400,12 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({
+      submitReport({
         id: addId.value,
-        formId: formId.value,
+        formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
       }).then((res) => {
         if (res.code === 200) {
+          ElMessage.success('已提交')
           close()
         }
       })
@@ -439,34 +415,9 @@
     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 = () => {}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -483,143 +434,114 @@
 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()
-      }
-    })
+const getInfo = () => {
+  getReportDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
+    if (res.data.businessOriginalRecord.equipmentInfoList && res.data.businessOriginalRecord.equipmentInfoList.length) {
+      formInline.value.businessOriginalRecord.equipmentInfoList = res.data.businessOriginalRecord.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    }
+    else {
+      formInline.value.businessOriginalRecord.equipmentInfoList = []
+    }
+    formInline.value.businessOriginalRecord.fileList = res.data.businessOriginalRecord.fileList || []
   })
 }
 
-// ----------------------------------------所用设备-------------------------------------
-// 点击所用设备增加行
-const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  formInline.value.equipmentInfoList.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    validDate: '', // 有效日期
-    manufacturingNo: '', // 出厂编号
-  })
-}
-
-const handleSelectionChangeMeasureDevice = (e: any) => {
-  checkoutMeasureDeviceList.value = e
-}
-
-// 点击所用设备删除行
-const delMeasureDeviceRow = () => {
-  if (checkoutMeasureDeviceList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
     })
   }
   else {
-    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.equipmentInfoList.splice(index, 1)
-        }
-      })
-    })
+    ElMessage.warning('流程实例id为空')
   }
 }
 
-// 点击选择测量设备编号
-const handleClickMeasureDevice = (index: number) => {
-  measureDeviceVisible.value = true
-  selectIndex.value = index
-}
-// 修改测量设备对话框显隐
-const changeMeasureDeviceVisible = (val: boolean) => {
-  measureDeviceVisible.value = val
-}
-// 选好测量设备
-const confirmCheckoutMeasureDevice = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
-  }
+// -------------------------------------------原始记录------------------------------------
+// 点击选择原始记录编号
+const handleClickPrimitiveLog = () => {
+  primitiveLogVisible.value = true
 }
 
-// ------------------------------------------技术文件----------------------------------
-// 点击技术文件增加行
-const addFilesRow = () => {
-  console.log(formInline.value.fileList)
+// 修改原始记录对话框显隐
+const changePrimitiveLogVisible = (val: boolean) => {
+  primitiveLogVisible.value = val
+}
+// 选好原始记录
+const confirmCheckoutPrimitiveLog = (val: any) => {
+  console.log(val)
 
-  const index = formInline.value.fileList.findIndex((item: fileListType) =>
-    !item.fileNo && !item.fileName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条文件信息')
-    return
-  }
-  formInline.value.fileList.push({
-    fileNo: '', // 编号
-    fileName: '', // 名称
-    fileCode: '', // 文件号
-  })
+  formInline.value.businessOriginalRecord = val
+  formInline.value.certifications = val.businessOrder.certifications // 证书类别
+  formInline.value.certificateReportCategory = val.businessOrder.certifications // 证书类别
+  formInline.value.sampleId = val.customerSampleInfo.id // 样品id
+  formInline.value.orderId = val.businessOrder.id // 委托书id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+}
+// --------------------------------------证书报告模板-----------------------------------
+// 选择证书报告模板Ref
+const templateDialog = ref()
+// 选择证书报告模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书报告模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  formInline.value.templateId = val.id // 证书报告模板id
+  formInline.value.templateName = val.templateName || '' // 证书报告模板名称
 }
 
-// 技术文件表格多选
-const handleSelectionChangeFiles = (e: any) => {
-  checkoutFilesList.value = e
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
 }
-// 点击技术文件删除行
-const delFilesRow = () => {
-  if (checkoutFilesList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutFilesList.value.forEach((item: fileListType) => {
-      formInline.value.fileList.forEach((element: fileListType, index: number) => {
-        if (element.fileNo === item.fileNo) {
-          formInline.value.fileList.splice(index, 1)
-        }
-      })
-    })
-  }
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  formInline.value.signId = val.id // 电子签章id
+  formInline.value.signName = val.signName || '' // 电子签章名称
 }
 
-// 点击选择文件编号
-const handleClickFiles = (index: number) => {
-  filesVisible.value = true
-  selectFliesIndex.value = index
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
 }
-// 修改技术文件对话框显隐
-const changeFilesVisible = (val: boolean) => {
-  filesVisible.value = val
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  formInline.value.approvalSignId = val.id // 认可标志专用章id
+  formInline.value.approvalSignName = val.signName || '' // 认可标志专用章名称
 }
-// 选好测量设备
-const confirmCheckoutFiles = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
-    }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
-  }
-}
-
 // -------------------------------------------底部-------------------------------------------
+
+onMounted(() => {
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情
+    formInline.value.taskId = JSON.parse($route.query.row as string).taskId // 任务id（同意、驳回等操作使用）
+    formInline.value.processId = JSON.parse($route.query.row as string).processId // 流程实例id
+    formInline.value.processInstanceId = JSON.parse($route.query.row as string).processInstanceId // 流程实例id（取消操作使用）
+    approvalStatusName.value = JSON.parse($route.query.row as string).approvalStatusName
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord(formInline.value.processId) // 查询审批记录
+    }
+  }
+})
 </script>
 
 <template>
@@ -647,6 +569,28 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="证书报告编号:">
+              <el-input
+                v-model.trim="formInline.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="formInline.certificateReportName"
+                :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="calibrationMajor">
               <el-select
                 v-model="formInline.calibrationMajor"
@@ -657,10 +601,10 @@
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -680,27 +624,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:" prop="certificateReportCode">
-              <el-input
-                v-model.trim="formInline.certificateReportCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
-                class="full-width-input"
+            <el-form-item label="有效日期:" prop="expirationDate">
+              <el-date-picker
+                v-model="formInline.expirationDate"
+                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="certificateReportName">
-              <el-input
-                v-model.trim="formInline.certificateReportName"
-                :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="templateName">
               <el-input
@@ -710,9 +647,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickTemplate">
                     选择
                   </el-button>
                 </template>
@@ -720,6 +655,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="证书报告类型:" prop="certificateReportType">
+              <el-select
+                v-model="formInline.certificateReportType"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in certificationClassMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="电子签章:" prop="signName">
               <el-input
                 v-model.trim="formInline.signName"
@@ -728,9 +682,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSignature">
                     选择
                   </el-button>
                 </template>
@@ -746,9 +698,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSpecialSignature">
                     选择
                   </el-button>
                 </template>
@@ -756,17 +706,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
+            <el-form-item label="原始记录编号:">
               <el-input
-                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickPrimitiveLog">
                     选择
                   </el-button>
                 </template>
@@ -774,136 +721,142 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
+            <el-form-item label="检校地点:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
-                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
+            <el-form-item label="温度(℃):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
+            <el-form-item label="相对湿度(%):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
+            <el-form-item label="样品编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
+            <el-form-item label="样品名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
+            <el-form-item label="出厂编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
+            <el-form-item label="型号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
+            <el-form-item label="委托方代码:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
+            <el-form-item label="委托方名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
+            <el-form-item label="委托方电话:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
+              <el-select
+                v-model="formInline.businessOriginalRecord.businessOrder.certifications"
+                clearable
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
+            <el-form-item label="委托方地址:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -913,10 +866,9 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -924,10 +876,9 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
-                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -938,10 +889,9 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -951,24 +901,22 @@
                 v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
+            <el-form-item label="检定项目:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -1001,29 +949,11 @@
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
-          增加行
-        </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="delMeasureDeviceRow"
-        >
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.equipmentInfoList"
+        :data="formInline.businessOriginalRecord.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeMeasureDevice"
       >
-        <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"
@@ -1032,54 +962,15 @@
           :label="item.text"
           :width="item.width"
           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"
-                  type="primary"
-                  @click="handleClickMeasureDevice(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="addFilesRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="delFilesRow">
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.fileList"
+        :data="formInline.businessOriginalRecord.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeFiles"
       >
-        <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"
@@ -1088,59 +979,24 @@
           :label="item.text"
           :width="item.width"
           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="handleClickFiles(scope.$index)"
-                >
-                  选择
-                </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>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
-  <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <!-- 选择原始记录 -->
+  <select-primitive-log-list v-model:visible="primitiveLogVisible" @confirm-checkout="confirmCheckoutPrimitiveLog" @change-visible="changePrimitiveLogVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择签章 -->
+  <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+  <!-- 选择认可标志专用签章 -->
+  <select-signature ref="specialSignatureDialog" @add="confirmCheckoutSpecialSignature" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 4f29225..21b9831 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -35,6 +35,7 @@
   ],
   未通过: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
   已取消: [
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 0cfcb0e..207663f 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -6,14 +6,19 @@
 import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
+import {
+  approvalDeleteReport,
+  draftDeleteReport,
+  exportReportList,
+  getReportList,
+  submitReport,
+} from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval } from '@/api/approval'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-
 const props = defineProps({
   status: {
     type: String,
@@ -48,17 +53,17 @@
 const total = ref(0)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'certificateReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
-  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -94,12 +99,6 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const buttonTypeMap = ref('')
 
 // 点击删除
 const handleDelete = (row: IList) => {
@@ -112,15 +111,28 @@
       type: 'warning',
     },
   ).then(() => {
-    deleteReportList({ id: row.id }).then((res) => {
-      if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-        fetchData(true)
-      }
-    })
+    if (row.approvalStatusName === '草稿箱') {
+      draftDeleteReport({ ids: [row.id] }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else { // 除草稿箱之外的删除，审批删除
+      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
   })
 }
 // 取消
@@ -213,8 +225,22 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
-  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
+const goDetail = (row: any, pageType: 'detail' | 'edit') => {
+  let from = ''
+  if (row.approvalStatusName === '草稿箱') {
+    from = 'caogao'
+  }
+  else {
+    from = 'reject'
+  }
+  $router.push({
+    path: `/lab/reportOnCredentialsApproval/${pageType}/${row.id}`,
+    query: {
+      from,
+      processId: row.processId,
+      row: JSON.stringify(row),
+    },
+  })
 }
 // 新建证书报告
 const add = () => {
@@ -236,7 +262,10 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
+    submitReport({
+      id: row.id,
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    }).then((res) => {
       if (res.code === 200) {
         ElMessage.success('已提交')
         fetchData(true)
@@ -373,6 +402,7 @@
                 :key="index"
                 size="small"
                 :type="item.type" link
+                :disabled="row.approvalStatusName !== '未通过-驳回' && item.name === '编辑'"
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 323bbf3..a8cd20d 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -119,3 +119,4 @@
   time: Boolean
   width?: string // 列宽
 }
+
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index acbf354..34a2da6 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -121,9 +121,9 @@
 // 获取检定证书
 const fetchCertifications = (query = null) => {
   if (pageType.value === 'detail') {
-    getCertification({ id: infoId.value }).then((res) => {
-      dataList.value.certificationRecords = res.data.rows
-    })
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
   }
 }
 
@@ -483,7 +483,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="检定周期:" prop="measurePeriod">
+              <el-form-item label="检定周期（月）:" prop="measurePeriod">
                 <el-input
                   v-model="dataForm.measurePeriod"
                   :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 71c8ed8..11abf8f 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -363,18 +363,21 @@
 }
 
 onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
+  // 获取字典-审批状态
+  getDict().then(() => {
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+      activeTitle.value === '全部'
+    }
+    nextTick(() => {
+      fetchData(true) // 获取表格数据
+      fetchDeptTreeList() // 获取使用部门
+      fetchUserList() // 获取人员列表
+    })
   })
 })
 onUnmounted(() => {

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 39efdb5..b0b0037 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -316,13 +316,13 @@
 }
 
 // --------------------------------------原始记录模板-----------------------------------
-// 选择环境记录单Ref
+// 选择原始记录模板Ref
 const templateDialog = ref()
-// 选择环境记录单
+// 选择原始记录模板
 const handleClickTemplate = () => {
   templateDialog.value.initDialog()
 }
-// 选择环境记录单表格确认
+// 选择原始记录模板确认
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
@@ -331,11 +331,13 @@
 // ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
+  if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+      !item.equipmentNo && !item.equipmentName)
+    if (index !== -1) {
+      ElMessage.warning('请完善上一条设备信息')
+      return
+    }
   }
   formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
@@ -469,12 +471,18 @@
   if (infoId.value) {
     getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
       formInline.value = res.data
-      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
-        }
-      })
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        formInline.value.equipmentInfoList = []
+      }
+      formInline.value.fileList = res.data.fileList || []
     })
   }
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c663f79..17040fc 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -4,11 +4,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, columnsType } from '../report_interface'
+import type { IFileList, columnsType, dictType } from '../report_interface'
 import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
 import SelectFiles from '../../components/selectFiles.vue'
+import selectPrimitiveLogList from '../../components/selectPrimitiveLogList.vue'
+import selectReportTemplate from '../../components/selectReportTemplate.vue'
+import selectSignature from '../../components/selectSignature.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -20,54 +24,45 @@
 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'
-import { addReport } from '@/api/business/lab/report'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import {
+  addReport,
+  draftUpdateReport,
+  failUpdateReport,
+  getReportDetail,
+  submitReport,
+} from '@/api/business/lab/report'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
 import type { fileListType } from '@/views/measure/file/file-interface'
+import { getDictByCode } from '@/api/system/dict'
 
 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: '查看',
 } // 字典
-const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
-const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
-const checkoutMeasureDeviceList = ref([]) // 所用设备多选
-const checkoutFilesList = ref([]) // 技术文件多选
-const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
-const filesVisible = ref(false) // 控制选择技术文件对话框显隐
-// 从路由中获取页面类型参数
+const primitiveLogVisible = ref(false) // 控制选择原始记录对话框显隐
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const certificationClassMap = ref<dictType[]>([]) // 证书报告类型
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type 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 from = ref('') // reject表示未通过驳回跳转过来的
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref({
+  taskId: '', // 任务id，用于审批
+  processId: '', // 	流程实例id
+  processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
   approvalSignId: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
-  approvalStatus: '', // 审批状态
+  approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
   calibrationMajorName: '', // 检校专业名称
+  certificateReportType: '', // 证书报告类型
   certificateReportCategory: '', // 证书类别
   certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
@@ -76,21 +71,21 @@
   issuanceDate: '', // 出具日期
   measureDeptId: '', // 检定部门id
   measurePersonId: '', // 检定人员
-  measureResult: '', // 检定结果
+  measureResult: '1', // 检定结果--(后端要求传1，写死)
   orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  printNum: '', // 	打印次数
-  printStatus: '', // 	可打印状态
-  processId: '', // 	流程实例id
+  printNum: 0, // 	打印次数(后端要求传0，写死)
+  printStatus: '3', // 	可打印状态--(后端要求传3，写死)
   sampleId: '', // 	样品id
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   remark: '', // 证书报告备注
   templateId: '', // 证书报告模板id
   templateName: '', // 证书报告模板名称
-  businessOriginalRecord: {
+  certifications: '', // 证书类别--用于传参
+  businessOriginalRecord: { // 原始记录下的内容
     calibrationPlace: '', // 检校地点
-    originalRecordNo: '', // 原始记录编号
+    originalRecordCode: '', // 原始记录编号
     businessEnvironmentRecord: { // 环境记录单
       temperature: '', // 环境记录单温度
       humidity: '', // 环境记录单相对湿度
@@ -114,60 +109,74 @@
       customerAddress: '', // 委托方地址
       planDeliverTime: '', // 预计送达时间
       requireOverTime: '', // 要求检完时间
+      certifications: '', // 证书类别
     },
+    equipmentInfoList: [] as any, // 测量设备
+    fileList: [] as any, // 技术文件
   } as any, // 原始记录
-  equipmentInfoList: [] as any, // 测量设备
-  fileList: [] as any, // 技术文件
-})
 
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-interface standardOwnerOptionsType {
-  id: string
-  name: string
-}
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-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 standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  infoId.value = $route.params.id as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
   }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  if ($route.query.from) {
+    from.value = $route.query.from as string
+  }
+  if ($route.query.processId) {
+    formInline.value.processId = $route.query.processId as string
+  }
 }
+
+// 表单验证规则
+const rules = ref({
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书报告名称不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportType': [{ required: true, message: '证书报告类型不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'expirationDate': [{ required: true, message: '有效日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordCode': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationClass')
+  certificationClassMap.value = resCertificationClass.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+
+const approvalDialog = ref()
+
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -261,7 +270,6 @@
   },
 ])
 
-getStandardOwnerOptions()
 // 初始化路由
 const $router = useRouter()
 
@@ -269,29 +277,6 @@
 const close = () => {
   $router.back()
 }
-// 表单验证规则
-const rules = ref({
-  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
-  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
-})
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -317,26 +302,6 @@
   fileRef.value.click()
 }
 
-// 获取详情信息
-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.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
-      item.choose = true
-      return item
-    })
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -374,22 +339,22 @@
   }
 }
 
-// 保存后的id
+// 保存后的id，用于提交
 const addId = ref('')
-// 点击顶部一排按钮
+// 保存、提交、关闭
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') { // 新建的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       if (valid) {
         ElMessageBox.confirm('确认保存吗？', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-          getStandardLisAdd(fromListInfo.value).then((res) => {
+          addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -399,23 +364,33 @@
       }
     })
   }
-  else if (item === '保存' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') { // 编辑的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       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
-            }
-          })
+          if (from.value === 'caogao') { // 草稿箱编辑
+            draftUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else if (from.value === 'reject') { // 未通过-驳回编辑
+            failUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         })
       }
     })
@@ -425,11 +400,12 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({
+      submitReport({
         id: addId.value,
-        formId: formId.value,
+        formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
       }).then((res) => {
         if (res.code === 200) {
+          ElMessage.success('已提交')
           close()
         }
       })
@@ -439,34 +415,9 @@
     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 = () => {}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -483,143 +434,114 @@
 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()
-      }
-    })
+const getInfo = () => {
+  getReportDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
+    if (res.data.businessOriginalRecord.equipmentInfoList && res.data.businessOriginalRecord.equipmentInfoList.length) {
+      formInline.value.businessOriginalRecord.equipmentInfoList = res.data.businessOriginalRecord.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    }
+    else {
+      formInline.value.businessOriginalRecord.equipmentInfoList = []
+    }
+    formInline.value.businessOriginalRecord.fileList = res.data.businessOriginalRecord.fileList || []
   })
 }
 
-// ----------------------------------------所用设备-------------------------------------
-// 点击所用设备增加行
-const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  formInline.value.equipmentInfoList.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    validDate: '', // 有效日期
-    manufacturingNo: '', // 出厂编号
-  })
-}
-
-const handleSelectionChangeMeasureDevice = (e: any) => {
-  checkoutMeasureDeviceList.value = e
-}
-
-// 点击所用设备删除行
-const delMeasureDeviceRow = () => {
-  if (checkoutMeasureDeviceList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
     })
   }
   else {
-    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.equipmentInfoList.splice(index, 1)
-        }
-      })
-    })
+    ElMessage.warning('流程实例id为空')
   }
 }
 
-// 点击选择测量设备编号
-const handleClickMeasureDevice = (index: number) => {
-  measureDeviceVisible.value = true
-  selectIndex.value = index
-}
-// 修改测量设备对话框显隐
-const changeMeasureDeviceVisible = (val: boolean) => {
-  measureDeviceVisible.value = val
-}
-// 选好测量设备
-const confirmCheckoutMeasureDevice = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
-  }
+// -------------------------------------------原始记录------------------------------------
+// 点击选择原始记录编号
+const handleClickPrimitiveLog = () => {
+  primitiveLogVisible.value = true
 }
 
-// ------------------------------------------技术文件----------------------------------
-// 点击技术文件增加行
-const addFilesRow = () => {
-  console.log(formInline.value.fileList)
+// 修改原始记录对话框显隐
+const changePrimitiveLogVisible = (val: boolean) => {
+  primitiveLogVisible.value = val
+}
+// 选好原始记录
+const confirmCheckoutPrimitiveLog = (val: any) => {
+  console.log(val)
 
-  const index = formInline.value.fileList.findIndex((item: fileListType) =>
-    !item.fileNo && !item.fileName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条文件信息')
-    return
-  }
-  formInline.value.fileList.push({
-    fileNo: '', // 编号
-    fileName: '', // 名称
-    fileCode: '', // 文件号
-  })
+  formInline.value.businessOriginalRecord = val
+  formInline.value.certifications = val.businessOrder.certifications // 证书类别
+  formInline.value.certificateReportCategory = val.businessOrder.certifications // 证书类别
+  formInline.value.sampleId = val.customerSampleInfo.id // 样品id
+  formInline.value.orderId = val.businessOrder.id // 委托书id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+}
+// --------------------------------------证书报告模板-----------------------------------
+// 选择证书报告模板Ref
+const templateDialog = ref()
+// 选择证书报告模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书报告模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  formInline.value.templateId = val.id // 证书报告模板id
+  formInline.value.templateName = val.templateName || '' // 证书报告模板名称
 }
 
-// 技术文件表格多选
-const handleSelectionChangeFiles = (e: any) => {
-  checkoutFilesList.value = e
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
 }
-// 点击技术文件删除行
-const delFilesRow = () => {
-  if (checkoutFilesList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutFilesList.value.forEach((item: fileListType) => {
-      formInline.value.fileList.forEach((element: fileListType, index: number) => {
-        if (element.fileNo === item.fileNo) {
-          formInline.value.fileList.splice(index, 1)
-        }
-      })
-    })
-  }
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  formInline.value.signId = val.id // 电子签章id
+  formInline.value.signName = val.signName || '' // 电子签章名称
 }
 
-// 点击选择文件编号
-const handleClickFiles = (index: number) => {
-  filesVisible.value = true
-  selectFliesIndex.value = index
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
 }
-// 修改技术文件对话框显隐
-const changeFilesVisible = (val: boolean) => {
-  filesVisible.value = val
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  formInline.value.approvalSignId = val.id // 认可标志专用章id
+  formInline.value.approvalSignName = val.signName || '' // 认可标志专用章名称
 }
-// 选好测量设备
-const confirmCheckoutFiles = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
-    }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
-  }
-}
-
 // -------------------------------------------底部-------------------------------------------
+
+onMounted(() => {
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情
+    formInline.value.taskId = JSON.parse($route.query.row as string).taskId // 任务id（同意、驳回等操作使用）
+    formInline.value.processId = JSON.parse($route.query.row as string).processId // 流程实例id
+    formInline.value.processInstanceId = JSON.parse($route.query.row as string).processInstanceId // 流程实例id（取消操作使用）
+    approvalStatusName.value = JSON.parse($route.query.row as string).approvalStatusName
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord(formInline.value.processId) // 查询审批记录
+    }
+  }
+})
 </script>
 
 <template>
@@ -647,6 +569,28 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="证书报告编号:">
+              <el-input
+                v-model.trim="formInline.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="formInline.certificateReportName"
+                :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="calibrationMajor">
               <el-select
                 v-model="formInline.calibrationMajor"
@@ -657,10 +601,10 @@
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -680,27 +624,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:" prop="certificateReportCode">
-              <el-input
-                v-model.trim="formInline.certificateReportCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
-                class="full-width-input"
+            <el-form-item label="有效日期:" prop="expirationDate">
+              <el-date-picker
+                v-model="formInline.expirationDate"
+                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="certificateReportName">
-              <el-input
-                v-model.trim="formInline.certificateReportName"
-                :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="templateName">
               <el-input
@@ -710,9 +647,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickTemplate">
                     选择
                   </el-button>
                 </template>
@@ -720,6 +655,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="证书报告类型:" prop="certificateReportType">
+              <el-select
+                v-model="formInline.certificateReportType"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in certificationClassMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="电子签章:" prop="signName">
               <el-input
                 v-model.trim="formInline.signName"
@@ -728,9 +682,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSignature">
                     选择
                   </el-button>
                 </template>
@@ -746,9 +698,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSpecialSignature">
                     选择
                   </el-button>
                 </template>
@@ -756,17 +706,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
+            <el-form-item label="原始记录编号:">
               <el-input
-                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickPrimitiveLog">
                     选择
                   </el-button>
                 </template>
@@ -774,136 +721,142 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
+            <el-form-item label="检校地点:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
-                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
+            <el-form-item label="温度(℃):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
+            <el-form-item label="相对湿度(%):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
+            <el-form-item label="样品编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
+            <el-form-item label="样品名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
+            <el-form-item label="出厂编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
+            <el-form-item label="型号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
+            <el-form-item label="委托方代码:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
+            <el-form-item label="委托方名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
+            <el-form-item label="委托方电话:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
+              <el-select
+                v-model="formInline.businessOriginalRecord.businessOrder.certifications"
+                clearable
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
+            <el-form-item label="委托方地址:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -913,10 +866,9 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -924,10 +876,9 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
-                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -938,10 +889,9 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -951,24 +901,22 @@
                 v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
+            <el-form-item label="检定项目:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -1001,29 +949,11 @@
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
-          增加行
-        </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="delMeasureDeviceRow"
-        >
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.equipmentInfoList"
+        :data="formInline.businessOriginalRecord.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeMeasureDevice"
       >
-        <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"
@@ -1032,54 +962,15 @@
           :label="item.text"
           :width="item.width"
           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"
-                  type="primary"
-                  @click="handleClickMeasureDevice(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="addFilesRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="delFilesRow">
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.fileList"
+        :data="formInline.businessOriginalRecord.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeFiles"
       >
-        <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"
@@ -1088,59 +979,24 @@
           :label="item.text"
           :width="item.width"
           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="handleClickFiles(scope.$index)"
-                >
-                  选择
-                </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>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
-  <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <!-- 选择原始记录 -->
+  <select-primitive-log-list v-model:visible="primitiveLogVisible" @confirm-checkout="confirmCheckoutPrimitiveLog" @change-visible="changePrimitiveLogVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择签章 -->
+  <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+  <!-- 选择认可标志专用签章 -->
+  <select-signature ref="specialSignatureDialog" @add="confirmCheckoutSpecialSignature" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 4f29225..21b9831 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -35,6 +35,7 @@
   ],
   未通过: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
   已取消: [
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 0cfcb0e..207663f 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -6,14 +6,19 @@
 import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
+import {
+  approvalDeleteReport,
+  draftDeleteReport,
+  exportReportList,
+  getReportList,
+  submitReport,
+} from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval } from '@/api/approval'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-
 const props = defineProps({
   status: {
     type: String,
@@ -48,17 +53,17 @@
 const total = ref(0)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'certificateReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
-  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -94,12 +99,6 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const buttonTypeMap = ref('')
 
 // 点击删除
 const handleDelete = (row: IList) => {
@@ -112,15 +111,28 @@
       type: 'warning',
     },
   ).then(() => {
-    deleteReportList({ id: row.id }).then((res) => {
-      if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-        fetchData(true)
-      }
-    })
+    if (row.approvalStatusName === '草稿箱') {
+      draftDeleteReport({ ids: [row.id] }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else { // 除草稿箱之外的删除，审批删除
+      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
   })
 }
 // 取消
@@ -213,8 +225,22 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
-  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
+const goDetail = (row: any, pageType: 'detail' | 'edit') => {
+  let from = ''
+  if (row.approvalStatusName === '草稿箱') {
+    from = 'caogao'
+  }
+  else {
+    from = 'reject'
+  }
+  $router.push({
+    path: `/lab/reportOnCredentialsApproval/${pageType}/${row.id}`,
+    query: {
+      from,
+      processId: row.processId,
+      row: JSON.stringify(row),
+    },
+  })
 }
 // 新建证书报告
 const add = () => {
@@ -236,7 +262,10 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
+    submitReport({
+      id: row.id,
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    }).then((res) => {
       if (res.code === 200) {
         ElMessage.success('已提交')
         fetchData(true)
@@ -373,6 +402,7 @@
                 :key="index"
                 size="small"
                 :type="item.type" link
+                :disabled="row.approvalStatusName !== '未通过-驳回' && item.name === '编辑'"
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 323bbf3..a8cd20d 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -119,3 +119,4 @@
   time: Boolean
   width?: string // 列宽
 }
+
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index acbf354..34a2da6 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -121,9 +121,9 @@
 // 获取检定证书
 const fetchCertifications = (query = null) => {
   if (pageType.value === 'detail') {
-    getCertification({ id: infoId.value }).then((res) => {
-      dataList.value.certificationRecords = res.data.rows
-    })
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
   }
 }
 
@@ -483,7 +483,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="检定周期:" prop="measurePeriod">
+              <el-form-item label="检定周期（月）:" prop="measurePeriod">
                 <el-input
                   v-model="dataForm.measurePeriod"
                   :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 71c8ed8..11abf8f 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -363,18 +363,21 @@
 }
 
 onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
+  // 获取字典-审批状态
+  getDict().then(() => {
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+      activeTitle.value === '全部'
+    }
+    nextTick(() => {
+      fetchData(true) // 获取表格数据
+      fetchDeptTreeList() // 获取使用部门
+      fetchUserList() // 获取人员列表
+    })
   })
 })
 onUnmounted(() => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index cb4dba8..2eda82d 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -306,7 +306,7 @@
 
 onMounted(async () => {
   await getDict()
-  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
   }
   else {

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 39efdb5..b0b0037 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -316,13 +316,13 @@
 }
 
 // --------------------------------------原始记录模板-----------------------------------
-// 选择环境记录单Ref
+// 选择原始记录模板Ref
 const templateDialog = ref()
-// 选择环境记录单
+// 选择原始记录模板
 const handleClickTemplate = () => {
   templateDialog.value.initDialog()
 }
-// 选择环境记录单表格确认
+// 选择原始记录模板确认
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
@@ -331,11 +331,13 @@
 // ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
+  if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+      !item.equipmentNo && !item.equipmentName)
+    if (index !== -1) {
+      ElMessage.warning('请完善上一条设备信息')
+      return
+    }
   }
   formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
@@ -469,12 +471,18 @@
   if (infoId.value) {
     getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
       formInline.value = res.data
-      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
-        }
-      })
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        formInline.value.equipmentInfoList = []
+      }
+      formInline.value.fileList = res.data.fileList || []
     })
   }
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c663f79..17040fc 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -4,11 +4,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, columnsType } from '../report_interface'
+import type { IFileList, columnsType, dictType } from '../report_interface'
 import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
 import SelectFiles from '../../components/selectFiles.vue'
+import selectPrimitiveLogList from '../../components/selectPrimitiveLogList.vue'
+import selectReportTemplate from '../../components/selectReportTemplate.vue'
+import selectSignature from '../../components/selectSignature.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -20,54 +24,45 @@
 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'
-import { addReport } from '@/api/business/lab/report'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import {
+  addReport,
+  draftUpdateReport,
+  failUpdateReport,
+  getReportDetail,
+  submitReport,
+} from '@/api/business/lab/report'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
 import type { fileListType } from '@/views/measure/file/file-interface'
+import { getDictByCode } from '@/api/system/dict'
 
 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: '查看',
 } // 字典
-const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
-const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
-const checkoutMeasureDeviceList = ref([]) // 所用设备多选
-const checkoutFilesList = ref([]) // 技术文件多选
-const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
-const filesVisible = ref(false) // 控制选择技术文件对话框显隐
-// 从路由中获取页面类型参数
+const primitiveLogVisible = ref(false) // 控制选择原始记录对话框显隐
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const certificationClassMap = ref<dictType[]>([]) // 证书报告类型
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type 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 from = ref('') // reject表示未通过驳回跳转过来的
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref({
+  taskId: '', // 任务id，用于审批
+  processId: '', // 	流程实例id
+  processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
   approvalSignId: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
-  approvalStatus: '', // 审批状态
+  approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
   calibrationMajorName: '', // 检校专业名称
+  certificateReportType: '', // 证书报告类型
   certificateReportCategory: '', // 证书类别
   certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
@@ -76,21 +71,21 @@
   issuanceDate: '', // 出具日期
   measureDeptId: '', // 检定部门id
   measurePersonId: '', // 检定人员
-  measureResult: '', // 检定结果
+  measureResult: '1', // 检定结果--(后端要求传1，写死)
   orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  printNum: '', // 	打印次数
-  printStatus: '', // 	可打印状态
-  processId: '', // 	流程实例id
+  printNum: 0, // 	打印次数(后端要求传0，写死)
+  printStatus: '3', // 	可打印状态--(后端要求传3，写死)
   sampleId: '', // 	样品id
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   remark: '', // 证书报告备注
   templateId: '', // 证书报告模板id
   templateName: '', // 证书报告模板名称
-  businessOriginalRecord: {
+  certifications: '', // 证书类别--用于传参
+  businessOriginalRecord: { // 原始记录下的内容
     calibrationPlace: '', // 检校地点
-    originalRecordNo: '', // 原始记录编号
+    originalRecordCode: '', // 原始记录编号
     businessEnvironmentRecord: { // 环境记录单
       temperature: '', // 环境记录单温度
       humidity: '', // 环境记录单相对湿度
@@ -114,60 +109,74 @@
       customerAddress: '', // 委托方地址
       planDeliverTime: '', // 预计送达时间
       requireOverTime: '', // 要求检完时间
+      certifications: '', // 证书类别
     },
+    equipmentInfoList: [] as any, // 测量设备
+    fileList: [] as any, // 技术文件
   } as any, // 原始记录
-  equipmentInfoList: [] as any, // 测量设备
-  fileList: [] as any, // 技术文件
-})
 
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-interface standardOwnerOptionsType {
-  id: string
-  name: string
-}
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-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 standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  infoId.value = $route.params.id as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
   }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  if ($route.query.from) {
+    from.value = $route.query.from as string
+  }
+  if ($route.query.processId) {
+    formInline.value.processId = $route.query.processId as string
+  }
 }
+
+// 表单验证规则
+const rules = ref({
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书报告名称不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportType': [{ required: true, message: '证书报告类型不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'expirationDate': [{ required: true, message: '有效日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordCode': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationClass')
+  certificationClassMap.value = resCertificationClass.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+
+const approvalDialog = ref()
+
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -261,7 +270,6 @@
   },
 ])
 
-getStandardOwnerOptions()
 // 初始化路由
 const $router = useRouter()
 
@@ -269,29 +277,6 @@
 const close = () => {
   $router.back()
 }
-// 表单验证规则
-const rules = ref({
-  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
-  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
-})
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -317,26 +302,6 @@
   fileRef.value.click()
 }
 
-// 获取详情信息
-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.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
-      item.choose = true
-      return item
-    })
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -374,22 +339,22 @@
   }
 }
 
-// 保存后的id
+// 保存后的id，用于提交
 const addId = ref('')
-// 点击顶部一排按钮
+// 保存、提交、关闭
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') { // 新建的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       if (valid) {
         ElMessageBox.confirm('确认保存吗？', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-          getStandardLisAdd(fromListInfo.value).then((res) => {
+          addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -399,23 +364,33 @@
       }
     })
   }
-  else if (item === '保存' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') { // 编辑的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       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
-            }
-          })
+          if (from.value === 'caogao') { // 草稿箱编辑
+            draftUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else if (from.value === 'reject') { // 未通过-驳回编辑
+            failUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         })
       }
     })
@@ -425,11 +400,12 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({
+      submitReport({
         id: addId.value,
-        formId: formId.value,
+        formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
       }).then((res) => {
         if (res.code === 200) {
+          ElMessage.success('已提交')
           close()
         }
       })
@@ -439,34 +415,9 @@
     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 = () => {}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -483,143 +434,114 @@
 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()
-      }
-    })
+const getInfo = () => {
+  getReportDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
+    if (res.data.businessOriginalRecord.equipmentInfoList && res.data.businessOriginalRecord.equipmentInfoList.length) {
+      formInline.value.businessOriginalRecord.equipmentInfoList = res.data.businessOriginalRecord.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    }
+    else {
+      formInline.value.businessOriginalRecord.equipmentInfoList = []
+    }
+    formInline.value.businessOriginalRecord.fileList = res.data.businessOriginalRecord.fileList || []
   })
 }
 
-// ----------------------------------------所用设备-------------------------------------
-// 点击所用设备增加行
-const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  formInline.value.equipmentInfoList.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    validDate: '', // 有效日期
-    manufacturingNo: '', // 出厂编号
-  })
-}
-
-const handleSelectionChangeMeasureDevice = (e: any) => {
-  checkoutMeasureDeviceList.value = e
-}
-
-// 点击所用设备删除行
-const delMeasureDeviceRow = () => {
-  if (checkoutMeasureDeviceList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
     })
   }
   else {
-    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.equipmentInfoList.splice(index, 1)
-        }
-      })
-    })
+    ElMessage.warning('流程实例id为空')
   }
 }
 
-// 点击选择测量设备编号
-const handleClickMeasureDevice = (index: number) => {
-  measureDeviceVisible.value = true
-  selectIndex.value = index
-}
-// 修改测量设备对话框显隐
-const changeMeasureDeviceVisible = (val: boolean) => {
-  measureDeviceVisible.value = val
-}
-// 选好测量设备
-const confirmCheckoutMeasureDevice = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
-  }
+// -------------------------------------------原始记录------------------------------------
+// 点击选择原始记录编号
+const handleClickPrimitiveLog = () => {
+  primitiveLogVisible.value = true
 }
 
-// ------------------------------------------技术文件----------------------------------
-// 点击技术文件增加行
-const addFilesRow = () => {
-  console.log(formInline.value.fileList)
+// 修改原始记录对话框显隐
+const changePrimitiveLogVisible = (val: boolean) => {
+  primitiveLogVisible.value = val
+}
+// 选好原始记录
+const confirmCheckoutPrimitiveLog = (val: any) => {
+  console.log(val)
 
-  const index = formInline.value.fileList.findIndex((item: fileListType) =>
-    !item.fileNo && !item.fileName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条文件信息')
-    return
-  }
-  formInline.value.fileList.push({
-    fileNo: '', // 编号
-    fileName: '', // 名称
-    fileCode: '', // 文件号
-  })
+  formInline.value.businessOriginalRecord = val
+  formInline.value.certifications = val.businessOrder.certifications // 证书类别
+  formInline.value.certificateReportCategory = val.businessOrder.certifications // 证书类别
+  formInline.value.sampleId = val.customerSampleInfo.id // 样品id
+  formInline.value.orderId = val.businessOrder.id // 委托书id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+}
+// --------------------------------------证书报告模板-----------------------------------
+// 选择证书报告模板Ref
+const templateDialog = ref()
+// 选择证书报告模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书报告模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  formInline.value.templateId = val.id // 证书报告模板id
+  formInline.value.templateName = val.templateName || '' // 证书报告模板名称
 }
 
-// 技术文件表格多选
-const handleSelectionChangeFiles = (e: any) => {
-  checkoutFilesList.value = e
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
 }
-// 点击技术文件删除行
-const delFilesRow = () => {
-  if (checkoutFilesList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutFilesList.value.forEach((item: fileListType) => {
-      formInline.value.fileList.forEach((element: fileListType, index: number) => {
-        if (element.fileNo === item.fileNo) {
-          formInline.value.fileList.splice(index, 1)
-        }
-      })
-    })
-  }
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  formInline.value.signId = val.id // 电子签章id
+  formInline.value.signName = val.signName || '' // 电子签章名称
 }
 
-// 点击选择文件编号
-const handleClickFiles = (index: number) => {
-  filesVisible.value = true
-  selectFliesIndex.value = index
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
 }
-// 修改技术文件对话框显隐
-const changeFilesVisible = (val: boolean) => {
-  filesVisible.value = val
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  formInline.value.approvalSignId = val.id // 认可标志专用章id
+  formInline.value.approvalSignName = val.signName || '' // 认可标志专用章名称
 }
-// 选好测量设备
-const confirmCheckoutFiles = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
-    }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
-  }
-}
-
 // -------------------------------------------底部-------------------------------------------
+
+onMounted(() => {
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情
+    formInline.value.taskId = JSON.parse($route.query.row as string).taskId // 任务id（同意、驳回等操作使用）
+    formInline.value.processId = JSON.parse($route.query.row as string).processId // 流程实例id
+    formInline.value.processInstanceId = JSON.parse($route.query.row as string).processInstanceId // 流程实例id（取消操作使用）
+    approvalStatusName.value = JSON.parse($route.query.row as string).approvalStatusName
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord(formInline.value.processId) // 查询审批记录
+    }
+  }
+})
 </script>
 
 <template>
@@ -647,6 +569,28 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="证书报告编号:">
+              <el-input
+                v-model.trim="formInline.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="formInline.certificateReportName"
+                :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="calibrationMajor">
               <el-select
                 v-model="formInline.calibrationMajor"
@@ -657,10 +601,10 @@
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -680,27 +624,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:" prop="certificateReportCode">
-              <el-input
-                v-model.trim="formInline.certificateReportCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
-                class="full-width-input"
+            <el-form-item label="有效日期:" prop="expirationDate">
+              <el-date-picker
+                v-model="formInline.expirationDate"
+                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="certificateReportName">
-              <el-input
-                v-model.trim="formInline.certificateReportName"
-                :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="templateName">
               <el-input
@@ -710,9 +647,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickTemplate">
                     选择
                   </el-button>
                 </template>
@@ -720,6 +655,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="证书报告类型:" prop="certificateReportType">
+              <el-select
+                v-model="formInline.certificateReportType"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in certificationClassMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="电子签章:" prop="signName">
               <el-input
                 v-model.trim="formInline.signName"
@@ -728,9 +682,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSignature">
                     选择
                   </el-button>
                 </template>
@@ -746,9 +698,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSpecialSignature">
                     选择
                   </el-button>
                 </template>
@@ -756,17 +706,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
+            <el-form-item label="原始记录编号:">
               <el-input
-                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickPrimitiveLog">
                     选择
                   </el-button>
                 </template>
@@ -774,136 +721,142 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
+            <el-form-item label="检校地点:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
-                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
+            <el-form-item label="温度(℃):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
+            <el-form-item label="相对湿度(%):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
+            <el-form-item label="样品编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
+            <el-form-item label="样品名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
+            <el-form-item label="出厂编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
+            <el-form-item label="型号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
+            <el-form-item label="委托方代码:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
+            <el-form-item label="委托方名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
+            <el-form-item label="委托方电话:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
+              <el-select
+                v-model="formInline.businessOriginalRecord.businessOrder.certifications"
+                clearable
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
+            <el-form-item label="委托方地址:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -913,10 +866,9 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -924,10 +876,9 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
-                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -938,10 +889,9 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -951,24 +901,22 @@
                 v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
+            <el-form-item label="检定项目:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -1001,29 +949,11 @@
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
-          增加行
-        </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="delMeasureDeviceRow"
-        >
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.equipmentInfoList"
+        :data="formInline.businessOriginalRecord.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeMeasureDevice"
       >
-        <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"
@@ -1032,54 +962,15 @@
           :label="item.text"
           :width="item.width"
           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"
-                  type="primary"
-                  @click="handleClickMeasureDevice(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="addFilesRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="delFilesRow">
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.fileList"
+        :data="formInline.businessOriginalRecord.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeFiles"
       >
-        <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"
@@ -1088,59 +979,24 @@
           :label="item.text"
           :width="item.width"
           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="handleClickFiles(scope.$index)"
-                >
-                  选择
-                </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>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
-  <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <!-- 选择原始记录 -->
+  <select-primitive-log-list v-model:visible="primitiveLogVisible" @confirm-checkout="confirmCheckoutPrimitiveLog" @change-visible="changePrimitiveLogVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择签章 -->
+  <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+  <!-- 选择认可标志专用签章 -->
+  <select-signature ref="specialSignatureDialog" @add="confirmCheckoutSpecialSignature" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 4f29225..21b9831 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -35,6 +35,7 @@
   ],
   未通过: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
   已取消: [
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 0cfcb0e..207663f 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -6,14 +6,19 @@
 import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
+import {
+  approvalDeleteReport,
+  draftDeleteReport,
+  exportReportList,
+  getReportList,
+  submitReport,
+} from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval } from '@/api/approval'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-
 const props = defineProps({
   status: {
     type: String,
@@ -48,17 +53,17 @@
 const total = ref(0)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'certificateReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
-  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -94,12 +99,6 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const buttonTypeMap = ref('')
 
 // 点击删除
 const handleDelete = (row: IList) => {
@@ -112,15 +111,28 @@
       type: 'warning',
     },
   ).then(() => {
-    deleteReportList({ id: row.id }).then((res) => {
-      if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-        fetchData(true)
-      }
-    })
+    if (row.approvalStatusName === '草稿箱') {
+      draftDeleteReport({ ids: [row.id] }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else { // 除草稿箱之外的删除，审批删除
+      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
   })
 }
 // 取消
@@ -213,8 +225,22 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
-  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
+const goDetail = (row: any, pageType: 'detail' | 'edit') => {
+  let from = ''
+  if (row.approvalStatusName === '草稿箱') {
+    from = 'caogao'
+  }
+  else {
+    from = 'reject'
+  }
+  $router.push({
+    path: `/lab/reportOnCredentialsApproval/${pageType}/${row.id}`,
+    query: {
+      from,
+      processId: row.processId,
+      row: JSON.stringify(row),
+    },
+  })
 }
 // 新建证书报告
 const add = () => {
@@ -236,7 +262,10 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
+    submitReport({
+      id: row.id,
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    }).then((res) => {
       if (res.code === 200) {
         ElMessage.success('已提交')
         fetchData(true)
@@ -373,6 +402,7 @@
                 :key="index"
                 size="small"
                 :type="item.type" link
+                :disabled="row.approvalStatusName !== '未通过-驳回' && item.name === '编辑'"
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 323bbf3..a8cd20d 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -119,3 +119,4 @@
   time: Boolean
   width?: string // 列宽
 }
+
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index acbf354..34a2da6 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -121,9 +121,9 @@
 // 获取检定证书
 const fetchCertifications = (query = null) => {
   if (pageType.value === 'detail') {
-    getCertification({ id: infoId.value }).then((res) => {
-      dataList.value.certificationRecords = res.data.rows
-    })
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
   }
 }
 
@@ -483,7 +483,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="检定周期:" prop="measurePeriod">
+              <el-form-item label="检定周期（月）:" prop="measurePeriod">
                 <el-input
                   v-model="dataForm.measurePeriod"
                   :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 71c8ed8..11abf8f 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -363,18 +363,21 @@
 }
 
 onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
+  // 获取字典-审批状态
+  getDict().then(() => {
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+      activeTitle.value === '全部'
+    }
+    nextTick(() => {
+      fetchData(true) // 获取表格数据
+      fetchDeptTreeList() // 获取使用部门
+      fetchUserList() // 获取人员列表
+    })
   })
 })
 onUnmounted(() => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index cb4dba8..2eda82d 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -306,7 +306,7 @@
 
 onMounted(async () => {
   await getDict()
-  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
   }
   else {
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 297acf9..8fe0388 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -128,9 +128,14 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  fetchApproval(processId).then((res) => {
-    approvalRecordData.value = res.data
-  })
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
 }
 
 // 点击数据后的操作按钮

diff --git a/src/api/business/lab/report.ts b/src/api/business/lab/report.ts
index 0e05759..cf7d249 100644
--- a/src/api/business/lab/report.ts
+++ b/src/api/business/lab/report.ts
@@ -51,21 +51,55 @@
   })
 }
 
-// // 编辑
-// export function updatePrimitiveLog(data: any) {
-//   return request({
-//     url: `${prefix}/update`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--草稿箱
+export function draftUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
 
-// // 获取详情
-// export function getPrimitiveLogDetail(data: { id: string }) {
-//   return request({
-//     url: `${prefix}/detail`,
-//     method: 'post',
-//     data,
-//   })
-// }
+// 编辑--未通过-驳回
+export function failUpdateReport(data: any) {
+  return request({
+    url: `${prefix}/failUpdate`,
+    method: 'post',
+    data,
+  })
+}
+// 培训计划保存后的提交
+export function submitReport(data: object) {
+  return request({
+    url: `${prefix}/submit`,
+    method: 'post',
+    data,
+  })
+}
 
+// 获取详情
+export function getReportDetail(data: { id: string }) {
+  return request({
+    url: `${prefix}/detail`,
+    method: 'post',
+    data,
+  })
+}
+
+// 草稿箱删除
+export function draftDeleteReport(data: { ids: Array<string> }) {
+  return request({
+    url: `${prefix}/batchDelete`,
+    method: 'post',
+    data,
+  })
+}
+
+// 审批删除
+export function approvalDeleteReport(data: { id: string; taskId: string }) {
+  return request({
+    url: `${prefix}/approval/operate/delete`,
+    method: 'post',
+    data: [data],
+  })
+}
diff --git a/src/api/customer/sampleList.ts b/src/api/customer/sampleList.ts
index 214ab71..fdcca51 100644
--- a/src/api/customer/sampleList.ts
+++ b/src/api/customer/sampleList.ts
@@ -62,7 +62,7 @@
 // 查询检定记录
 export function getMesureRecords(data: { customerId?: string; sampleId?: string }) {
   return request({
-    url: `${prefix}/sample/mesureRecordsBySampleId`,
+    url: `${prefix}/sample/measureRecordsById`,
     method: 'post',
     data,
   })
diff --git a/src/views/business/lab/components/selectMeasureDevice.vue b/src/views/business/lab/components/selectMeasureDevice.vue
index 1ff5620..54e382d 100644
--- a/src/views/business/lab/components/selectMeasureDevice.vue
+++ b/src/views/business/lab/components/selectMeasureDevice.vue
@@ -156,7 +156,7 @@
 
 <template>
   <div class="select-kehu-dialog">
-    <el-dialog v-model="visible" title="选择样品" width="65%" @close="cancle">
+    <el-dialog v-model="visible" title="选择设备" width="65%" @close="cancle">
       <search-area
         :need-clear="true"
         @search="searchList" @clear="clearList"
diff --git a/src/views/business/lab/components/selectPrimitiveLogList.vue b/src/views/business/lab/components/selectPrimitiveLogList.vue
new file mode 100644
index 0000000..51e508e
--- /dev/null
+++ b/src/views/business/lab/components/selectPrimitiveLogList.vue
@@ -0,0 +1,237 @@
+<!-- 选择原始记录 -->
+<script setup lang="ts" name="SelectMeasureDevice">
+import { ref } from 'vue'
+import type { Ref } from 'vue'
+import { ElMessage } from 'element-plus'
+import dayjs from 'dayjs'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { fixedAssetsParams, fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
+import { listPageApi } from '@/api/device/standingBook'
+import type { IList, IListQuery, dictType } from '@/views/business/lab/primitiveLog/primitiveLogList'
+import { getPrimitiveLogDetail, getPrimitiveLogList } from '@/api/business/lab/primitiveLogList'
+import { getDictByCode } from '@/api/system/dict'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false,
+  },
+})
+const emits = defineEmits(['changeVisible', 'confirmCheckout'])
+const mesureCategoryList = ref<dictType[]>([]) // 校检类别
+// 查询条件
+const listQuery = ref<IListQuery>({
+  measureCategory: '',	// 校验类别
+  createUser: '',	// 创建人
+  manufacturingNo: '',	// 出厂编号
+  originalRecordCode: '',	// 原始记录单编号
+  sampleModel: '',	// 样品型号
+  sampleName: '',	// 样品名称
+  sampleNo: '',	// 样品编号
+  offset: 1, // 当前页
+  limit: 20, // 每页多少条
+})
+// 表头
+const columns = ref<TableColumn[]>([
+  { text: '原始记录编号', value: 'originalRecordCode', width: '160', align: 'center', fixed: true },
+  { text: '原始记录名称', value: 'originalRecordName', align: 'center', width: '110', fixed: true },
+  { text: '样品编号', value: 'sampleNo', align: 'center', width: '160' },
+  { text: '样品名称', value: 'sampleName', align: 'center' },
+  { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
+  { text: '型号', value: 'sampleModel', align: 'center' },
+  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '创建人', value: 'createUser', align: 'center' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '备注', value: 'remark', align: 'center' },
+])
+// 表格数据
+const list = ref<IList[]>([])
+// 总数
+const total = ref(0)
+// 表格加载状态
+const loadingTable = ref(false)
+// 选中的内容
+const checkoutList = ref([]) as any
+// 获取字典值
+async function getDict() {
+  // 校检类别
+  const response = await getDictByCode('measureCategory')
+  mesureCategoryList.value = response.data
+}
+getDict()
+
+// 列表数据查询
+const fetchData = (isNowPage: boolean) => {
+  loadingTable.value = true
+  if (!isNowPage) {
+    // 是否显示当前页，否则跳转第一页
+    listQuery.value.offset = 1
+  }
+  getPrimitiveLogList(listQuery.value).then((res) => {
+    list.value = res.data.rows.map((item: IList) => {
+      return {
+        ...item,
+        sampleNo: item.customerSampleInfo.sampleNo, // 样品编号
+        sampleName: item.customerSampleInfo.sampleName, // 样品名称
+        manufacturingNo: item.customerSampleInfo.manufacturingNo, // 出厂编号
+        sampleModel: item.customerSampleInfo.sampleModel, // 型号
+        measureCategory: mesureCategoryList.value.find(i => i.value === item.measureCategory) ? mesureCategoryList.value.find(i => i.value === item.measureCategory)!.name : '', // 校检类别
+      }
+    })
+    total.value = res.data.total
+    loadingTable.value = false
+  })
+}
+
+// 多选发生改变时
+function handleSelectionChange(e: any) {
+  checkoutList.value = e.map((item: any) => {
+    return {
+      ...item,
+      isEdit: false,
+    }
+  })
+}
+// 点击搜索
+const searchList = () => {
+  fetchData(true)
+}
+// 点击重置
+const clearList = () => {
+  listQuery.value = {
+    measureCategory: '',	// 校验类别
+    createUser: '',	// 创建人
+    manufacturingNo: '',	// 出厂编号
+    originalRecordCode: '',	// 原始记录单编号
+    sampleModel: '',	// 样品型号
+    sampleName: '',	// 样品名称
+    sampleNo: '',	// 样品编号
+    offset: 1, // 当前页
+    limit: 20, // 每页多少条
+  }
+  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 cancle = () => {
+  emits('changeVisible', false)
+}
+
+// 获取详情信息
+const fetchDetail = (id: string) => {
+  if (id) {
+    getPrimitiveLogDetail({ id }).then((res) => {
+      let responseData = {} as any
+      responseData = res.data
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        responseData.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        responseData.equipmentInfoList = []
+      }
+      responseData.fileList = res.data.fileList || []
+      emits('confirmCheckout', responseData)
+      cancle()
+    })
+  }
+}
+
+// 点击确定
+const clickConfirmSample = async () => {
+  if (!checkoutList.value.length) {
+    ElMessage({
+      message: '请选中',
+      type: 'warning',
+    })
+  }
+  await fetchDetail(checkoutList.value[0].id)
+}
+
+watch(() => props.visible, (newValue) => {
+  if (newValue) {
+    fetchData(true)
+  }
+})
+</script>
+
+<template>
+  <div class="select-kehu-dialog">
+    <el-dialog v-model="visible" title="选择原始记录" width="65%" @close="cancle">
+      <search-area :need-clear="true" @search="searchList" @clear="clearList">
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.originalRecordCode"
+            placeholder="原始记录编号"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-input
+            v-model.trim="listQuery.sampleName"
+            placeholder="样品名称"
+            clearable
+          />
+        </search-item>
+        <search-item>
+          <el-select
+            v-model="listQuery.measureCategory"
+            placeholder="请选择检校类别"
+            style="width: 195px;"
+            clearable
+          >
+            <el-option
+              v-for="item in mesureCategoryList"
+              :key="item.value"
+              :label="item.name"
+              :value="item.value"
+            />
+          </el-select>
+        </search-item>
+      </search-area>
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="listQuery"
+        :list-loading="loadingTable"
+        is-showmulti-select
+        :is-multi="false"
+        @change="changePage"
+        @multiSelect="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+      <template #footer>
+        <el-button type="primary" @click="clickConfirmSample">
+          确定
+        </el-button>
+        <el-button @click="cancle">
+          取消
+        </el-button>
+      </template>
+    </el-dialog>
+  </div>
+</template>
diff --git a/src/views/business/lab/components/selectReportTemplate.vue b/src/views/business/lab/components/selectReportTemplate.vue
new file mode 100644
index 0000000..58687e7
--- /dev/null
+++ b/src/views/business/lab/components/selectReportTemplate.vue
@@ -0,0 +1,166 @@
+<!-- 选择证书报告模板 -->
+<script lang="ts" setup name="SelectReportTemplate">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { templatePage } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  templateNo: '', // 编号
+  templateName: '', // 名称
+  templateCreator: '', // 负责人
+  createStartTime: '',
+  createEndTime: '',
+  limit: 20,
+  offset: 1,
+  templateType: '',
+  ids: [] as string[],
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '编号', value: 'templateNo', align: 'center', width: '180' },
+  { text: '模板名称', value: 'templateName', align: 'center', width: '150' },
+  { text: '模板负责人', value: 'templateCreator', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'templateDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('templateType')
+  searchQuery.templateType = res.data.filter((item: typeofSign) => item.name === '证书报告模板')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  templatePage(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  searchQuery.templateNo = '' // 编号
+  searchQuery.templateName = '' // 名称
+  searchQuery.templateCreator = '' // 负责人
+  searchQuery.createStartTime = ''
+  searchQuery.createEndTime = ''
+  searchQuery.limit = 20
+  searchQuery.offset = 1
+  searchQuery.templateType = ''
+  searchQuery.ids = []
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选择证书报告模板')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择证书报告模板" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.templateNo" placeholder="编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateName" placeholder="模板名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.templateCreator" placeholder="模板负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/components/selectSignature.vue b/src/views/business/lab/components/selectSignature.vue
new file mode 100644
index 0000000..35e7b5d
--- /dev/null
+++ b/src/views/business/lab/components/selectSignature.vue
@@ -0,0 +1,163 @@
+<!-- 选择签章 -->
+<script lang="ts" setup name="selectSignature">
+import { ElMessage } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { getTypeSelect } from '@/api/system/price'
+import { getDictByCode } from '@/api/system/dict'
+import type { typeofSign } from '@/views/system/tool/tool_interface'
+import { listPageApi } from '@/api/system/tool'
+
+const emits = defineEmits(['add'])
+const dialogFormVisible = ref(false) // 控制弹窗显隐
+// 查询参数
+const searchQuery = reactive({
+  signNo: '', // 编号
+  signName: '', // 名称
+  signDirector: '', // 负责人
+  createEndTime: '',
+  createStartTime: '',
+  ids: [],
+  limit: 20,
+  offset: 1,
+  signType: '',
+}) // 查询参数
+const loadingTable = ref(false) // loading
+const list = ref([]) // 表格参数
+const total = ref(0)
+const columns = ref<TableColumn[]>([
+  { text: '签章编号', value: 'signNo', align: 'center', width: '180' },
+  { text: '签章名称', value: 'signName', align: 'center', width: '150' },
+  { text: '签章负责人', value: 'signDirector', align: 'center', width: '100' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '250' },
+  { text: '描述', value: 'signDesc', align: 'center' },
+])
+const checkoutList = ref<string[]>([]) // 多选选中参数
+// 获取类型
+const getType = async () => {
+  const res = await getDictByCode('signType')
+  searchQuery.signType = res.data.filter((item: typeofSign) => item.name === '签章')[0].value
+}
+// 获取数据列表
+const getList = () => {
+  loadingTable.value = true
+  listPageApi(searchQuery).then((res) => {
+    if (res.code === 200) {
+      list.value = res.data.rows
+      total.value = res.data.total
+    }
+    loadingTable.value = false
+  }).catch((_) => {
+    loadingTable.value = false
+  })
+}
+// 页数发生变化后的操作，可能是页码变化，可能是每页容量变化，此函数必写
+const changePage = (val: { size?: number; page?: number }) => {
+  if (val && val.size) {
+    searchQuery.limit = val.size
+  }
+  if (val && val.page) {
+    searchQuery.offset = val.page
+  }
+  getList()
+}
+
+// 搜索
+const search = () => {
+  getList()
+}
+// 重置
+const clearList = () => {
+  // createTime.value = ''
+  searchQuery.createEndTime = ''
+  searchQuery.createStartTime = ''
+  searchQuery.signDirector = ''
+  searchQuery.signName = ''
+  searchQuery.signNo = ''
+  getList()
+}
+
+// 点击保存
+const submitForm = () => {
+  if (!checkoutList.value.length) {
+    ElMessage.warning('请选中')
+  }
+  else {
+    emits('add', checkoutList.value[0])
+    dialogFormVisible.value = false
+  }
+}
+
+// 取消
+const resetForm = () => {
+  dialogFormVisible.value = false
+  clearList()
+}
+
+// 多选选中
+const handleSelectionChange = (val: any) => {
+  checkoutList.value = val
+}
+
+// 初始化
+const initDialog = () => {
+  dialogFormVisible.value = true
+  getType().then((_) => {
+    getList()
+  })
+}
+defineExpose({ initDialog })
+</script>
+
+<template>
+  <el-dialog v-model="dialogFormVisible" title="选择签章" width="65%">
+    <!-- 筛选条件 -->
+    <search-area :need-clear="true" @search="search" @clear="clearList">
+      <search-item>
+        <el-input v-model="searchQuery.signNo" placeholder="签章编号" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signName" placeholder="签章名称" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+      <search-item>
+        <el-input v-model="searchQuery.signDirector" placeholder="负责人" clearable class="w-50 m-2 normal-input" />
+      </search-item>
+    </search-area>
+    <!-- 查询结果Table显示 -->
+    <div style="padding: 12px;">
+      <normal-table
+        :data="list"
+        :total="total"
+        :columns="columns"
+        :query="searchQuery"
+        is-showmulti-select
+        :list-loading="loadingTable"
+        :is-multi="false"
+        @change="changePage"
+        @multi-select="handleSelectionChange"
+      >
+        <!-- 序号 -->
+        <template #preColumns>
+          <el-table-column label="#" width="55" align="center" fixed>
+            <template #default="scope">
+              {{ (searchQuery.offset - 1) * searchQuery.limit + scope.$index + 1 }}
+            </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/business/lab/primitiveLog/primitiveLogList.vue b/src/views/business/lab/primitiveLog/primitiveLogList.vue
index 4b2730e..bbbb958 100644
--- a/src/views/business/lab/primitiveLog/primitiveLogList.vue
+++ b/src/views/business/lab/primitiveLog/primitiveLogList.vue
@@ -240,7 +240,7 @@
       <search-item>
         <el-select
           v-model="listQuery.measureCategory"
-          placeholder="请选择检测类别"
+          placeholder="请选择检校类别"
           style="width: 195px;"
           clearable
         >
diff --git a/src/views/business/lab/primitiveLog/primitveLogAdd.vue b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
index 39efdb5..b0b0037 100644
--- a/src/views/business/lab/primitiveLog/primitveLogAdd.vue
+++ b/src/views/business/lab/primitiveLog/primitveLogAdd.vue
@@ -316,13 +316,13 @@
 }
 
 // --------------------------------------原始记录模板-----------------------------------
-// 选择环境记录单Ref
+// 选择原始记录模板Ref
 const templateDialog = ref()
-// 选择环境记录单
+// 选择原始记录模板
 const handleClickTemplate = () => {
   templateDialog.value.initDialog()
 }
-// 选择环境记录单表格确认
+// 选择原始记录模板确认
 const confirmCheckoutTemplate = (val: any) => {
   formInline.value.templateId = val.id// 	原始记录模板id
   formInline.value.templateName = val.templateName// 原始记录模板名称
@@ -331,11 +331,13 @@
 // ----------------------------------------所用设备-------------------------------------
 // 点击所用设备增加行
 const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
+  if (formInline.value.equipmentInfoList && formInline.value.equipmentInfoList.length) {
+    const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
+      !item.equipmentNo && !item.equipmentName)
+    if (index !== -1) {
+      ElMessage.warning('请完善上一条设备信息')
+      return
+    }
   }
   formInline.value.equipmentInfoList.push({
     equipmentName: '', // 设备名称
@@ -469,12 +471,18 @@
   if (infoId.value) {
     getPrimitiveLogDetail({ id: infoId.value }).then((res) => {
       formInline.value = res.data
-      formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
-        return {
-          ...item,
-          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
-        }
-      })
+      if (res.data.equipmentInfoList && res.data.equipmentInfoList.length) {
+        formInline.value.equipmentInfoList = res.data.equipmentInfoList.map((item: fixedAssetsType) => {
+          return {
+            ...item,
+            validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+          }
+        })
+      }
+      else {
+        formInline.value.equipmentInfoList = []
+      }
+      formInline.value.fileList = res.data.fileList || []
     })
   }
 }
diff --git a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
index c663f79..17040fc 100644
--- a/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
+++ b/src/views/business/lab/reportOnCredentials/components/reportOnCredentialsAdd.vue
@@ -4,11 +4,15 @@
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import dayjs from 'dayjs'
-import type { IFileList, columnsType } from '../report_interface'
+import type { IFileList, columnsType, dictType } from '../report_interface'
 import selectMeasureDevice from '../../components/selectMeasureDevice.vue'
 import SelectFiles from '../../components/selectFiles.vue'
+import selectPrimitiveLogList from '../../components/selectPrimitiveLogList.vue'
+import selectReportTemplate from '../../components/selectReportTemplate.vue'
+import selectSignature from '../../components/selectSignature.vue'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { getStaffList } from '@/api/measure/person'
+import { cancelApproval, fetchApproval, submitApproval } from '@/api/approval'
 import {
   getStandardLisAdd,
   getStandardLisdetali,
@@ -20,54 +24,45 @@
 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'
-import { addReport } from '@/api/business/lab/report'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import {
+  addReport,
+  draftUpdateReport,
+  failUpdateReport,
+  getReportDetail,
+  submitReport,
+} from '@/api/business/lab/report'
 import type { fixedAssetsType } from '@/views/device/standingBook/standingBook-interface'
 import type { fileListType } from '@/views/measure/file/file-interface'
+import { getDictByCode } from '@/api/system/dict'
 
 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: '查看',
 } // 字典
-const selectIndex = ref() // 所用设备表格-点击选择的index--点击第几行
-const selectFliesIndex = ref() // 技术文件表格-点击选择的index---点击第几行
-const checkoutMeasureDeviceList = ref([]) // 所用设备多选
-const checkoutFilesList = ref([]) // 技术文件多选
-const measureDeviceVisible = ref(false) // 控制选择测量设备对话框显隐
-const filesVisible = ref(false) // 控制选择技术文件对话框显隐
-// 从路由中获取页面类型参数
+const primitiveLogVisible = ref(false) // 控制选择原始记录对话框显隐
+const calibrationMajorMap = ref<dictType[]>([]) // 校检专业
+const certificationClassMap = ref<dictType[]>([]) // 证书报告类型
+const certificationTypeMap = ref<dictType[]>([]) // 证书类别
+const approvalStatusName = ref('') // 审批状态、控制草稿箱没有审批流程
 const $route = useRoute()
-const formId = ref<string>('')
 const { username } = useUserStore()
-if ($route.params && $route.params.type) {
-  pageType.value = $route.params.type 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 from = ref('') // reject表示未通过驳回跳转过来的
 const ruleFormRef = ref<FormInstance>()
-// 逻辑代码
 const formInline = ref({
+  taskId: '', // 任务id，用于审批
+  processId: '', // 	流程实例id
+  processInstanceId: '', // 流程实例id--用于取消（又定为取消使用processId）
   approvalSignId: '', // 认可标志专用章id
   approvalSignName: '', // 认可标志专用章名称
-  approvalStatus: '', // 审批状态
+  approvalStatus: '1', // 审批状态--(后端要求传1，写死)
   calibrationMajor: '', // 检校专业
   calibrationMajorName: '', // 检校专业名称
+  certificateReportType: '', // 证书报告类型
   certificateReportCategory: '', // 证书类别
   certificateReportCode: '', // 证书报告编号
   certificateReportFile: '', // 证书报告附件
@@ -76,21 +71,21 @@
   issuanceDate: '', // 出具日期
   measureDeptId: '', // 检定部门id
   measurePersonId: '', // 检定人员
-  measureResult: '', // 检定结果
+  measureResult: '1', // 检定结果--(后端要求传1，写死)
   orderId: '', // 委托书id
   originalRecordId: '', // 原始记录id
-  printNum: '', // 	打印次数
-  printStatus: '', // 	可打印状态
-  processId: '', // 	流程实例id
+  printNum: 0, // 	打印次数(后端要求传0，写死)
+  printStatus: '3', // 	可打印状态--(后端要求传3，写死)
   sampleId: '', // 	样品id
   signId: '', // 	电子签章id
   signName: '', // 	电子签章名称
   remark: '', // 证书报告备注
   templateId: '', // 证书报告模板id
   templateName: '', // 证书报告模板名称
-  businessOriginalRecord: {
+  certifications: '', // 证书类别--用于传参
+  businessOriginalRecord: { // 原始记录下的内容
     calibrationPlace: '', // 检校地点
-    originalRecordNo: '', // 原始记录编号
+    originalRecordCode: '', // 原始记录编号
     businessEnvironmentRecord: { // 环境记录单
       temperature: '', // 环境记录单温度
       humidity: '', // 环境记录单相对湿度
@@ -114,60 +109,74 @@
       customerAddress: '', // 委托方地址
       planDeliverTime: '', // 预计送达时间
       requireOverTime: '', // 要求检完时间
+      certifications: '', // 证书类别
     },
+    equipmentInfoList: [] as any, // 测量设备
+    fileList: [] as any, // 技术文件
   } as any, // 原始记录
-  equipmentInfoList: [] as any, // 测量设备
-  fileList: [] as any, // 技术文件
-})
 
-// 下拉框数组类型
-interface IOptions {
-  id: string
-  name: string
-  value: string
-  organizeName: string
-  deptId: string
-}
-interface standardOwnerOptionsType {
-  id: string
-  name: string
-}
-// 标准所在部门下拉框
-const standardUsersDeptList = ref<IOptions[]>([])
-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 standardOwnerOptions = ref<standardOwnerOptionsType[]>([])
-// 获取到标准负责人数组
-const getStandardOwnerOptions = () => {
-  const params = {
-    staffNo: '', // 人员编号
-    name: '', // 姓名
-    deptId: '', // 工作部门
-    major: '', // 计量专业
-    verifierCertificateNo: '', // 证书号
-    certificateStatus: '', // 证书状态
-    limit: 100000,
-    offset: 1,
+// 从路由中获取页面类型参数
+if ($route.params && $route.params.type) {
+  pageType.value = $route.params.type as string
+  infoId.value = $route.params.id as string
+  if (pageType.value === 'add') {
+    buttonArray.value = ['提交', '保存']
   }
-  getStaffList(params).then((res) => {
-    standardOwnerOptions.value = res.data.records
-  })
+  else if (pageType.value === 'edit') {
+    buttonArray.value = ['保存']
+  }
+  // else {
+  //   buttonArray.value = ['同意', '驳回', '拒绝']
+  // }
+  if ($route.query.from) {
+    from.value = $route.query.from as string
+  }
+  if ($route.query.processId) {
+    formInline.value.processId = $route.query.processId as string
+  }
 }
+
+// 表单验证规则
+const rules = ref({
+  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportName': [{ required: true, message: '证书报告名称不能为空', trigger: ['blur', 'change'] }],
+  'certificateReportType': [{ required: true, message: '证书报告类型不能为空', trigger: ['blur', 'change'] }],
+  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
+  'expirationDate': [{ required: true, message: '有效日期不能为空', trigger: ['blur', 'change'] }],
+  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
+  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
+  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.originalRecordCode': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
+  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
+})
+// 获取字典值
+async function getDict() {
+  // 校检专业
+  const response = await getDictByCode('calibrationMajor')
+  calibrationMajorMap.value = response.data
+  // 证书类型
+  const resCertificationClass = await getDictByCode('certificationClass')
+  certificationClassMap.value = resCertificationClass.data
+  // 证书类别
+  const rescertificationType = await getDictByCode('certificationType')
+  certificationTypeMap.value = rescertificationType.data
+}
+getDict()
+
+const approvalDialog = ref()
+
 // 审批弹窗开关
 const applyShow = ref(false)
 // 审批弹窗信息收集类型
@@ -261,7 +270,6 @@
   },
 ])
 
-getStandardOwnerOptions()
 // 初始化路由
 const $router = useRouter()
 
@@ -269,29 +277,6 @@
 const close = () => {
   $router.back()
 }
-// 表单验证规则
-const rules = ref({
-  'calibrationMajor': [{ required: true, message: '检校专业不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportCode': [{ required: true, message: '证书编号不能为空', trigger: ['blur', 'change'] }],
-  'certificateReportName': [{ required: true, message: '证书名称不能为空', trigger: ['blur', 'change'] }],
-  'issuanceDate': [{ required: true, message: '出具日期不能为空', trigger: ['blur', 'change'] }],
-  'templateName': [{ required: true, message: '证书报告模板不能为空', trigger: ['blur', 'change'] }],
-  'signName': [{ required: true, message: '电子签章不能为空', trigger: ['blur', 'change'] }],
-  'approvalSignName': [{ required: true, message: '认可标志专用章不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.originalRecordNo': [{ required: true, message: '原始记录编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleNo': [{ required: true, message: '样品编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleName': [{ required: true, message: '样品名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.sampleModel': [{ required: true, message: '型号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturer': [{ required: true, message: '生产厂家不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.temperature': [{ required: true, message: '温度(℃)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessEnvironmentRecord.humidity': [{ required: true, message: '相对湿度(%)不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.manufacturingNo': [{ required: true, message: '出厂编号不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerNo': [{ required: true, message: '委托方代码不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerName': [{ required: true, message: '委托方名称不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerPhone': [{ required: true, message: '委托方电话不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.businessOrder.customerAddress': [{ required: true, message: '委托方地址不能为空', trigger: ['blur', 'change'] }],
-  'businessOriginalRecord.customerSampleInfo.measureContent': [{ required: true, message: '检定项目不能为空', trigger: ['blur', 'change'] }],
-})
 
 const fileRef = ref() // 文件上传input
 const onFileChange = (event: any) => {
@@ -317,26 +302,6 @@
   fileRef.value.click()
 }
 
-// 获取详情信息
-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.fixedAssetsList = res.data.fixedAssetsList
-    fromListInfo.value.fileList = res.data.fileList.map((item: IFileList) => {
-      item.choose = true
-      return item
-    })
-  })
-}
-if (pageType.value !== 'add') {
-  getInfo(infoId.value)
-}
-
 // 取消
 const handleCancel = () => {
   const params = {
@@ -374,22 +339,22 @@
   }
 }
 
-// 保存后的id
+// 保存后的id，用于提交
 const addId = ref('')
-// 点击顶部一排按钮
+// 保存、提交、关闭
 const getAddList = async (item: string, formEl: FormInstance | undefined) => {
-  if (item === '保存' && pageType.value === 'add') {
+  if (item === '保存' && pageType.value === 'add') { // 新建的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       if (valid) {
         ElMessageBox.confirm('确认保存吗？', '提示', {
           confirmButtonText: '确认',
           cancelButtonText: '取消',
           type: 'warning',
         }).then(() => {
-          getStandardLisAdd(fromListInfo.value).then((res) => {
+          addReport(formInline.value).then((res) => {
             if (res.code === 200) {
               ElMessage.success('保存成功')
               addId.value = res.data.id
@@ -399,23 +364,33 @@
       }
     })
   }
-  else if (item === '保存' && pageType.value === 'edit') {
+  else if (item === '保存' && pageType.value === 'edit') { // 编辑的保存
     if (!formEl) {
       return
     }
-    await formEl.validate((valid, fields) => {
+    await formEl.validate((valid) => {
       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
-            }
-          })
+          if (from.value === 'caogao') { // 草稿箱编辑
+            draftUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
+          else if (from.value === 'reject') { // 未通过-驳回编辑
+            failUpdateReport(formInline.value).then((res) => {
+              if (res.code === 200) {
+                ElMessage.success('保存成功')
+                close()
+              }
+            })
+          }
         })
       }
     })
@@ -425,11 +400,12 @@
       ElMessage.warning('请先保存')
     }
     else {
-      submitStandardEquipmentApply({
+      submitReport({
         id: addId.value,
-        formId: formId.value,
+        formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
       }).then((res) => {
         if (res.code === 200) {
+          ElMessage.success('已提交')
           close()
         }
       })
@@ -439,34 +415,9 @@
     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 = () => {}
-watch(
-  () => formInline.value,
-  (newVal) => {
-    // 变化后存储
-  },
-  { deep: true, immediate: true },
-)
 // 审批弹窗的关闭
 const applyListClose = () => {
   applyShow.value = false
@@ -483,143 +434,114 @@
 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()
-      }
-    })
+const getInfo = () => {
+  getReportDetail({ id: infoId.value }).then((res) => {
     formInline.value = res.data
+    if (res.data.businessOriginalRecord.equipmentInfoList && res.data.businessOriginalRecord.equipmentInfoList.length) {
+      formInline.value.businessOriginalRecord.equipmentInfoList = res.data.businessOriginalRecord.equipmentInfoList.map((item: fixedAssetsType) => {
+        return {
+          ...item,
+          validDate: item.validDate ? dayjs(item.validDate).format('YYYY-MM-DD') : '',
+        }
+      })
+    }
+    else {
+      formInline.value.businessOriginalRecord.equipmentInfoList = []
+    }
+    formInline.value.businessOriginalRecord.fileList = res.data.businessOriginalRecord.fileList || []
   })
 }
 
-// ----------------------------------------所用设备-------------------------------------
-// 点击所用设备增加行
-const addMeasureDeviceRow = () => {
-  const index = formInline.value.equipmentInfoList.findIndex((item: fixedAssetsType) =>
-    !item.equipmentNo && !item.equipmentName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条设备信息')
-    return
-  }
-  formInline.value.equipmentInfoList.push({
-    equipmentName: '', // 设备名称
-    equipmentNo: '', // 设备编号
-    modelNo: '', // 型号
-    validDate: '', // 有效日期
-    manufacturingNo: '', // 出厂编号
-  })
-}
-
-const handleSelectionChangeMeasureDevice = (e: any) => {
-  checkoutMeasureDeviceList.value = e
-}
-
-// 点击所用设备删除行
-const delMeasureDeviceRow = () => {
-  if (checkoutMeasureDeviceList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
+const approvalRecordData = ref([]) // 审批流程数据
+// 查询审批记录
+function getApprovalRecord(processId: string) {
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
     })
   }
   else {
-    checkoutMeasureDeviceList.value.forEach((item: fixedAssetsType) => {
-      formInline.value.equipmentInfoList.forEach((element: fixedAssetsType, index: number) => {
-        if (element.equipmentNo === item.equipmentNo) {
-          formInline.value.equipmentInfoList.splice(index, 1)
-        }
-      })
-    })
+    ElMessage.warning('流程实例id为空')
   }
 }
 
-// 点击选择测量设备编号
-const handleClickMeasureDevice = (index: number) => {
-  measureDeviceVisible.value = true
-  selectIndex.value = index
-}
-// 修改测量设备对话框显隐
-const changeMeasureDeviceVisible = (val: boolean) => {
-  measureDeviceVisible.value = val
-}
-// 选好测量设备
-const confirmCheckoutMeasureDevice = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.equipmentInfoList.findIndex((i: fixedAssetsType) => val[0].equipmentNo === i.equipmentNo)
-    if (index !== -1) {
-      ElMessage.warning('此设备已添加过')
-      return
-    }
-    formInline.value.equipmentInfoList.splice(selectIndex.value, 1, val[0])
-  }
+// -------------------------------------------原始记录------------------------------------
+// 点击选择原始记录编号
+const handleClickPrimitiveLog = () => {
+  primitiveLogVisible.value = true
 }
 
-// ------------------------------------------技术文件----------------------------------
-// 点击技术文件增加行
-const addFilesRow = () => {
-  console.log(formInline.value.fileList)
+// 修改原始记录对话框显隐
+const changePrimitiveLogVisible = (val: boolean) => {
+  primitiveLogVisible.value = val
+}
+// 选好原始记录
+const confirmCheckoutPrimitiveLog = (val: any) => {
+  console.log(val)
 
-  const index = formInline.value.fileList.findIndex((item: fileListType) =>
-    !item.fileNo && !item.fileName)
-  if (index !== -1) {
-    ElMessage.warning('请完善上一条文件信息')
-    return
-  }
-  formInline.value.fileList.push({
-    fileNo: '', // 编号
-    fileName: '', // 名称
-    fileCode: '', // 文件号
-  })
+  formInline.value.businessOriginalRecord = val
+  formInline.value.certifications = val.businessOrder.certifications // 证书类别
+  formInline.value.certificateReportCategory = val.businessOrder.certifications // 证书类别
+  formInline.value.sampleId = val.customerSampleInfo.id // 样品id
+  formInline.value.orderId = val.businessOrder.id // 委托书id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+  formInline.value.originalRecordId = val.id // 原始记录id
+}
+// --------------------------------------证书报告模板-----------------------------------
+// 选择证书报告模板Ref
+const templateDialog = ref()
+// 选择证书报告模板
+const handleClickTemplate = () => {
+  templateDialog.value.initDialog()
+}
+// 选择证书报告模板确认
+const confirmCheckoutTemplate = (val: any) => {
+  formInline.value.templateId = val.id // 证书报告模板id
+  formInline.value.templateName = val.templateName || '' // 证书报告模板名称
 }
 
-// 技术文件表格多选
-const handleSelectionChangeFiles = (e: any) => {
-  checkoutFilesList.value = e
+// --------------------------------------选择签章-----------------------------------
+// 选择签章Ref
+const signatureDialog = ref()
+// 选择签章模板
+const handleClickSignature = () => {
+  signatureDialog.value.initDialog()
 }
-// 点击技术文件删除行
-const delFilesRow = () => {
-  if (checkoutFilesList.value.length <= 0) {
-    ElMessage({
-      message: '请选中要删除的行',
-      type: 'warning',
-    })
-  }
-  else {
-    checkoutFilesList.value.forEach((item: fileListType) => {
-      formInline.value.fileList.forEach((element: fileListType, index: number) => {
-        if (element.fileNo === item.fileNo) {
-          formInline.value.fileList.splice(index, 1)
-        }
-      })
-    })
-  }
+// 选择签章确认
+const confirmCheckoutSignature = (val: any) => {
+  formInline.value.signId = val.id // 电子签章id
+  formInline.value.signName = val.signName || '' // 电子签章名称
 }
 
-// 点击选择文件编号
-const handleClickFiles = (index: number) => {
-  filesVisible.value = true
-  selectFliesIndex.value = index
+// --------------------------------------选择认可标志专用章-----------------------------------
+// 选择认可标志专用章ref
+const specialSignatureDialog = ref()
+// 选择认可标志专用章
+const handleClickSpecialSignature = () => {
+  specialSignatureDialog.value.initDialog()
 }
-// 修改技术文件对话框显隐
-const changeFilesVisible = (val: boolean) => {
-  filesVisible.value = val
+// 选择认可标志专用章确认
+const confirmCheckoutSpecialSignature = (val: any) => {
+  formInline.value.approvalSignId = val.id // 认可标志专用章id
+  formInline.value.approvalSignName = val.signName || '' // 认可标志专用章名称
 }
-// 选好测量设备
-const confirmCheckoutFiles = (val: any) => {
-  if (val && val.length) {
-    const index = formInline.value.fileList.findIndex((i: fileListType) => val[0].fileNo === i.fileNo)
-    if (index !== -1) {
-      ElMessage.warning('此文件已添加过')
-      return
-    }
-    formInline.value.fileList.splice(selectFliesIndex.value, 1, val[0])
-  }
-}
-
 // -------------------------------------------底部-------------------------------------------
+
+onMounted(() => {
+  if (pageType.value !== 'add') {
+    getInfo() // 获取详情
+    formInline.value.taskId = JSON.parse($route.query.row as string).taskId // 任务id（同意、驳回等操作使用）
+    formInline.value.processId = JSON.parse($route.query.row as string).processId // 流程实例id
+    formInline.value.processInstanceId = JSON.parse($route.query.row as string).processInstanceId // 流程实例id（取消操作使用）
+    approvalStatusName.value = JSON.parse($route.query.row as string).approvalStatusName
+    if (approvalStatusName.value !== '草稿箱') {
+      getApprovalRecord(formInline.value.processId) // 查询审批记录
+    }
+  }
+})
 </script>
 
 <template>
@@ -647,6 +569,28 @@
       >
         <el-row :gutter="20">
           <el-col :span="6">
+            <el-form-item label="证书报告编号:">
+              <el-input
+                v-model.trim="formInline.certificateReportCode"
+                placeholder="系统自动生成"
+                class="full-width-input"
+                clearable
+                disabled
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书报告名称:" prop="certificateReportName">
+              <el-input
+                v-model.trim="formInline.certificateReportName"
+                :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="calibrationMajor">
               <el-select
                 v-model="formInline.calibrationMajor"
@@ -657,10 +601,10 @@
                 :disabled="pageType === 'detail'"
               >
                 <el-option
-                  v-for="item in standardOwnerOptions"
-                  :key="item.id"
+                  v-for="item in calibrationMajorMap"
+                  :key="item.value"
                   :label="item.name"
-                  :value="item.id"
+                  :value="item.value"
                 />
               </el-select>
             </el-form-item>
@@ -680,27 +624,20 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="证书编号:" prop="certificateReportCode">
-              <el-input
-                v-model.trim="formInline.certificateReportCode"
-                :placeholder="pageType === 'detail' ? '' : '请输入证书编号'"
-                class="full-width-input"
+            <el-form-item label="有效日期:" prop="expirationDate">
+              <el-date-picker
+                v-model="formInline.expirationDate"
+                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="certificateReportName">
-              <el-input
-                v-model.trim="formInline.certificateReportName"
-                :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="templateName">
               <el-input
@@ -710,9 +647,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickTemplate">
                     选择
                   </el-button>
                 </template>
@@ -720,6 +655,25 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
+            <el-form-item label="证书报告类型:" prop="certificateReportType">
+              <el-select
+                v-model="formInline.certificateReportType"
+                clearable
+                :placeholder="pageType === 'detail' ? '' : '请选择证书报告类型'"
+                size="default"
+                style="width: 100%;"
+                :disabled="pageType === 'detail'"
+              >
+                <el-option
+                  v-for="item in certificationClassMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item label="电子签章:" prop="signName">
               <el-input
                 v-model.trim="formInline.signName"
@@ -728,9 +682,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSignature">
                     选择
                   </el-button>
                 </template>
@@ -746,9 +698,7 @@
                 :disabled="pageType === 'detail'"
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickSpecialSignature">
                     选择
                   </el-button>
                 </template>
@@ -756,17 +706,14 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="原始记录编号:" prop="businessOriginalRecord.originalRecordNo">
+            <el-form-item label="原始记录编号:">
               <el-input
-                v-model.trim="formInline.businessOriginalRecord.originalRecordNo"
-                :placeholder="pageType === 'detail' ? '' : '请选择原始记录编号'"
+                v-model.trim="formInline.businessOriginalRecord.originalRecordCode"
                 class="full-width-input"
-                :disabled="pageType === 'detail'"
+                disabled
               >
                 <template v-if="pageType !== 'detail'" #append>
-                  <el-button
-                    size="small"
-                  >
+                  <el-button size="small" @click="handleClickPrimitiveLog">
                     选择
                   </el-button>
                 </template>
@@ -774,136 +721,142 @@
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="检校地点:" prop="businessOriginalRecord.calibrationPlace">
+            <el-form-item label="检校地点:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.calibrationPlace"
-                :placeholder="pageType === 'detail' ? '' : '请输入检校地点'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="温度(℃):" prop="businessOriginalRecord.businessEnvironmentRecord.temperature">
+            <el-form-item label="温度(℃):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.temperature"
-                :placeholder="pageType === 'detail' ? '' : '请输入温度(℃)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="相对湿度(%):" prop="businessOriginalRecord.businessEnvironmentRecord.humidity">
+            <el-form-item label="相对湿度(%):">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessEnvironmentRecord.humidity"
-                :placeholder="pageType === 'detail' ? '' : '请输入相对湿度(%)'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品编号:" prop="businessOriginalRecord.customerSampleInfo.sampleNo">
+            <el-form-item label="样品编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="样品名称:" prop="businessOriginalRecord.customerSampleInfo.sampleName">
+            <el-form-item label="样品名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleName"
-                :placeholder="pageType === 'detail' ? '' : '请输入样品名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="出厂编号:" prop="businessOriginalRecord.customerSampleInfo.manufacturingNo">
+            <el-form-item label="出厂编号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturingNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入出厂编号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="型号:" prop="businessOriginalRecord.customerSampleInfo.sampleModel">
+            <el-form-item label="型号:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.sampleModel"
-                :placeholder="pageType === 'detail' ? '' : '请输入型号'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="生产厂家:" prop="businessOriginalRecord.customerSampleInfo.manufacturer">
+            <el-form-item label="生产厂家:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.manufacturer"
-                :placeholder="pageType === 'detail' ? '' : '请输入生产厂家'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方代码:" prop="businessOriginalRecord.businessOrder.customerNo">
+            <el-form-item label="委托方代码:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerNo"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方代码'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方名称:" prop="businessOriginalRecord.businessOrder.customerName">
+            <el-form-item label="委托方名称:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerName"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方名称'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="委托方电话:" prop="businessOriginalRecord.businessOrder.customerPhone">
+            <el-form-item label="委托方电话:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerPhone"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方电话'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="证书类别:" prop="businessOriginalRecord.businessOrder.certifications">
+              <el-select
+                v-model="formInline.businessOriginalRecord.businessOrder.certifications"
+                clearable
+                size="default"
+                style="width: 100%;"
+                disabled
+              >
+                <el-option
+                  v-for="item in certificationTypeMap"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="委托方地址:" prop="businessOriginalRecord.businessOrder.customerAddress">
+            <el-form-item label="委托方地址:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.businessOrder.customerAddress"
-                :placeholder="pageType === 'detail' ? '' : '请输入委托方地址'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -913,10 +866,9 @@
             <el-form-item label="送检人:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.deliverer"
-                :placeholder="pageType === 'detail' ? '' : '请输入送检人'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -924,10 +876,9 @@
             <el-form-item label="联系方式:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.delivererTel"
-                :placeholder="pageType === 'detail' ? '' : '请输入联系方式'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -938,10 +889,9 @@
                 type="datetime"
                 style="width: 100%;"
                 clearable
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -951,24 +901,22 @@
                 v-model="formInline.businessOriginalRecord.businessOrder.requireOverTime"
                 type="datetime"
                 style="width: 100%;"
-                :placeholder="pageType === 'detail' ? '' : '请选择预计送达时间'"
                 format="YYYY-MM-DD hh:mm:ss"
                 clearable
-                value-format="YYYY-MM-DD HH:mm:ss a"
-                :disabled="pageType === 'detail'"
+                value-format="YYYY-MM-DD hh:mm:ss"
+                disabled
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检定项目:" prop="businessOriginalRecord.customerSampleInfo.measureContent">
+            <el-form-item label="检定项目:">
               <el-input
                 v-model.trim="formInline.businessOriginalRecord.customerSampleInfo.measureContent"
-                :placeholder="pageType === 'detail' ? '' : '请输入检定项目'"
                 class="full-width-input"
                 clearable
-                :disabled="pageType === 'detail'"
+                disabled
               />
             </el-form-item>
           </el-col>
@@ -1001,29 +949,11 @@
       </el-form>
     </detail-page>
     <detail-block title=" 所用设备">
-      <template v-if="pageType !== 'detail'" #btns>
-        <el-button v-if="pageType !== 'detail'" type="primary" @click="addMeasureDeviceRow">
-          增加行
-        </el-button>
-        <el-button
-          v-if="pageType !== 'detail'"
-          type="info"
-          @click="delMeasureDeviceRow"
-        >
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.equipmentInfoList"
+        :data="formInline.businessOriginalRecord.equipmentInfoList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeMeasureDevice"
       >
-        <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"
@@ -1032,54 +962,15 @@
           :label="item.text"
           :width="item.width"
           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"
-                  type="primary"
-                  @click="handleClickMeasureDevice(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="addFilesRow">
-          增加行
-        </el-button>
-        <el-button type="info" @click="delFilesRow">
-          删除行
-        </el-button>
-      </template>
       <el-table
-        :data="formInline.fileList"
+        :data="formInline.businessOriginalRecord.fileList"
         border
         style="width: 100%;"
-        @selection-change="handleSelectionChangeFiles"
       >
-        <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"
@@ -1088,59 +979,24 @@
           :label="item.text"
           :width="item.width"
           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="handleClickFiles(scope.$index)"
-                >
-                  选择
-                </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>
+    <detail-block v-if="approvalStatusName !== '草稿箱' && pageType !== 'add'" title="审批流程">
+      <!-- 审批流程 -->
+      <approval-record ref="approvalRecord" :approval-record-data="approvalRecordData" />
+    </detail-block>
   </app-container>
   <!-- 审批弹窗信息收集 -->
   <approval-dialog ref="approvalDialog" @on-success="approvalSuccess" />
-  <!-- 选择设备弹窗 -->
-  <select-measure-device v-model:visible="measureDeviceVisible" @confirm-checkout="confirmCheckoutMeasureDevice" @change-visible="changeMeasureDeviceVisible" />
-  <!-- 选择所依据的技术文件（在用的计量规程） -->
-  <select-files v-model:visible="filesVisible" @confirm-checkout="confirmCheckoutFiles" @change-visible="changeFilesVisible" />
+  <!-- 选择原始记录 -->
+  <select-primitive-log-list v-model:visible="primitiveLogVisible" @confirm-checkout="confirmCheckoutPrimitiveLog" @change-visible="changePrimitiveLogVisible" />
+  <!-- 选择原始记录模板 -->
+  <select-report-template ref="templateDialog" @add="confirmCheckoutTemplate" />
+  <!-- 选择签章 -->
+  <select-signature ref="signatureDialog" @add="confirmCheckoutSignature" />
+  <!-- 选择认可标志专用签章 -->
+  <select-signature ref="specialSignatureDialog" @add="confirmCheckoutSpecialSignature" />
 </template>
 
 <style lang="scss">
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
index 4f29225..21b9831 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsApproval.vue
@@ -35,6 +35,7 @@
   ],
   未通过: [
     { name: '查看', type: 'primary' },
+    { name: '编辑', type: 'primary' },
     { name: '删除', type: 'danger' },
   ],
   已取消: [
diff --git a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
index 0cfcb0e..207663f 100644
--- a/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
+++ b/src/views/business/lab/reportOnCredentials/reportOnCredentialsList.vue
@@ -6,14 +6,19 @@
 import type { IList, IListQuery, dictType } from './report_interface'
 import type { IButton, ISupplier, IlistTypes, supplierExportQuery } from '@/views/measure/source/list_interface'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteReportList, exportReportList, getReportList, submitReportList } from '@/api/business/lab/report'
+import {
+  approvalDeleteReport,
+  draftDeleteReport,
+  exportReportList,
+  getReportList,
+  submitReport,
+} from '@/api/business/lab/report'
 import ApprovalDialog from '@/components/Approval/ApprovalDialog.vue'
 import { printJSON } from '@/utils/printUtils'
 import { SCHEDULE } from '@/utils/scheduleDict'
 import { cancelApproval } from '@/api/approval'
 import { getDictByCode } from '@/api/system/dict'
 import { exportFile } from '@/utils/exportUtils'
-
 const props = defineProps({
   status: {
     type: String,
@@ -48,17 +53,17 @@
 const total = ref(0)
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '证书号', value: 'certificateReportCode', align: 'center' },
-  { text: '证书名称', value: 'certificateReportName', width: '120', align: 'center' },
+  { text: '证书号', value: 'certificateReportCode', width: '160', align: 'center' },
+  { text: '证书名称', value: 'certificateReportName', align: 'center' },
   { text: '样品编号', value: 'sampleNo', align: 'center' },
   { text: '样品名称', value: 'sampleName', align: 'center' },
   { text: '型号', value: 'sampleModel', align: 'center' },
   { text: '出厂编号', value: 'manufacturingNo', align: 'center' },
-  { text: '委托书编号', value: 'orderCode', width: '120', align: 'center' },
-  { text: '检校类别', value: 'measureCategory', align: 'center' },
+  { text: '委托书编号', value: 'orderCode', width: '160', align: 'center' },
+  { text: '检校类别', value: 'measureCategoryName', align: 'center' },
   { text: '检定人员', value: 'measurePersonId', align: 'center' },
-  { text: '审批状态', value: 'approvalStatusName', align: 'center' },
-  { text: '创建时间', value: 'createTime', align: 'center' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '110' },
+  { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
 ])
 // 初始化路由
 const $router = useRouter()
@@ -94,12 +99,6 @@
 const handleSelectionChange = (e: any) => {
   checkoutList.value = e.map((item: { id: string }) => item.id)
 }
-// 点击删除和编辑的参数类型
-interface rowReturn {
-  id: string
-  supplierName: string
-}
-const buttonTypeMap = ref('')
 
 // 点击删除
 const handleDelete = (row: IList) => {
@@ -112,15 +111,28 @@
       type: 'warning',
     },
   ).then(() => {
-    deleteReportList({ id: row.id }).then((res) => {
-      if (res.code === 200) {
-        ElMessage({
-          type: 'success',
-          message: '删除成功',
-        })
-        fetchData(true)
-      }
-    })
+    if (row.approvalStatusName === '草稿箱') {
+      draftDeleteReport({ ids: [row.id] }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
+    else { // 除草稿箱之外的删除，审批删除
+      approvalDeleteReport({ id: row.id, taskId: row.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage({
+            type: 'success',
+            message: '删除成功',
+          })
+          fetchData(true)
+        }
+      })
+    }
   })
 }
 // 取消
@@ -213,8 +225,22 @@
   fetchData(true)
 }
 // 跳转到详情
-const goDetail = (row: IList, pageType: 'detail' | 'edit') => {
-  $router.push(`/lab/reportOnCredentialsApproval/${pageType}/${row.id}`)
+const goDetail = (row: any, pageType: 'detail' | 'edit') => {
+  let from = ''
+  if (row.approvalStatusName === '草稿箱') {
+    from = 'caogao'
+  }
+  else {
+    from = 'reject'
+  }
+  $router.push({
+    path: `/lab/reportOnCredentialsApproval/${pageType}/${row.id}`,
+    query: {
+      from,
+      processId: row.processId,
+      row: JSON.stringify(row),
+    },
+  })
 }
 // 新建证书报告
 const add = () => {
@@ -236,7 +262,10 @@
     cancelButtonText: '取消',
     type: 'warning',
   }).then(() => {
-    submitReportList({ id: row.id, formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS }).then((res) => {
+    submitReport({
+      id: row.id,
+      formId: SCHEDULE.BUSINESS_REPORT_ON_CREDENTIALS,
+    }).then((res) => {
       if (res.code === 200) {
         ElMessage.success('已提交')
         fetchData(true)
@@ -373,6 +402,7 @@
                 :key="index"
                 size="small"
                 :type="item.type" link
+                :disabled="row.approvalStatusName !== '未通过-驳回' && item.name === '编辑'"
                 @click="clickBtn(row, item.name)"
               >
                 {{ item.name }}
diff --git a/src/views/business/lab/reportOnCredentials/report_interface.ts b/src/views/business/lab/reportOnCredentials/report_interface.ts
index 323bbf3..a8cd20d 100644
--- a/src/views/business/lab/reportOnCredentials/report_interface.ts
+++ b/src/views/business/lab/reportOnCredentials/report_interface.ts
@@ -119,3 +119,4 @@
   time: Boolean
   width?: string // 列宽
 }
+
diff --git a/src/views/customer/sample/list/edit.vue b/src/views/customer/sample/list/edit.vue
index acbf354..34a2da6 100644
--- a/src/views/customer/sample/list/edit.vue
+++ b/src/views/customer/sample/list/edit.vue
@@ -121,9 +121,9 @@
 // 获取检定证书
 const fetchCertifications = (query = null) => {
   if (pageType.value === 'detail') {
-    getCertification({ id: infoId.value }).then((res) => {
-      dataList.value.certificationRecords = res.data.rows
-    })
+    // getCertification({ id: infoId.value }).then((res) => {
+    //   dataList.value.certificationRecords = res.data.rows
+    // })
   }
 }
 
@@ -483,7 +483,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="检定周期:" prop="measurePeriod">
+              <el-form-item label="检定周期（月）:" prop="measurePeriod">
                 <el-input
                   v-model="dataForm.measurePeriod"
                   :placeholder="pageType === 'detail' ? '' : '请输入检定周期'"
diff --git a/src/views/device/receive/apply/applyList.vue b/src/views/device/receive/apply/applyList.vue
index 71c8ed8..11abf8f 100644
--- a/src/views/device/receive/apply/applyList.vue
+++ b/src/views/device/receive/apply/applyList.vue
@@ -363,18 +363,21 @@
 }
 
 onMounted(async () => {
-  await getDict() // 获取字典-审批状态
-  if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '') {
-    active.value = window.sessionStorage.getItem('buttonBoxActive')!
-  }
-  else {
-    active.value = menu.value.find(item => item.name === '全部')!.id // 全部
-    activeTitle.value === '全部'
-  }
-  nextTick(() => {
-    fetchData(true) // 获取表格数据
-    fetchDeptTreeList() // 获取使用部门
-    fetchUserList() // 获取人员列表
+  // 获取字典-审批状态
+  getDict().then(() => {
+    if (window.sessionStorage.getItem('buttonBoxActive') !== 'undefined' && window.sessionStorage.getItem('buttonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
+      active.value = window.sessionStorage.getItem('buttonBoxActive')!
+      console.log(window.sessionStorage.getItem('buttonBoxActive'))
+    }
+    else {
+      active.value = menu.value.find(item => item.name === '全部')!.id // 全部
+      activeTitle.value === '全部'
+    }
+    nextTick(() => {
+      fetchData(true) // 获取表格数据
+      fetchDeptTreeList() // 获取使用部门
+      fetchUserList() // 获取人员列表
+    })
   })
 })
 onUnmounted(() => {
diff --git a/src/views/device/receive/solve/solveList.vue b/src/views/device/receive/solve/solveList.vue
index cb4dba8..2eda82d 100644
--- a/src/views/device/receive/solve/solveList.vue
+++ b/src/views/device/receive/solve/solveList.vue
@@ -306,7 +306,7 @@
 
 onMounted(async () => {
   await getDict()
-  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '') {
+  if (window.sessionStorage.getItem('solveButtonBoxActive') !== 'undefined' && window.sessionStorage.getItem('solveButtonBoxActive') !== '' && window.sessionStorage.getItem('buttonBoxActive') !== null) {
     active.value = window.sessionStorage.getItem('solveButtonBoxActive')!
   }
   else {
diff --git a/src/views/measure/train/components/planApprovalDetail.vue b/src/views/measure/train/components/planApprovalDetail.vue
index 297acf9..8fe0388 100644
--- a/src/views/measure/train/components/planApprovalDetail.vue
+++ b/src/views/measure/train/components/planApprovalDetail.vue
@@ -128,9 +128,14 @@
 const approvalRecordData = ref([]) // 审批流程数据
 // 查询审批记录
 function getApprovalRecord(processId: string) {
-  fetchApproval(processId).then((res) => {
-    approvalRecordData.value = res.data
-  })
+  if (processId) {
+    fetchApproval(processId).then((res) => {
+      approvalRecordData.value = res.data
+    })
+  }
+  else {
+    ElMessage.warning('流程实例id为空')
+  }
 }
 
 // 点击数据后的操作按钮
diff --git a/src/views/system/process/detailProcess.vue b/src/views/system/process/detailProcess.vue
index 0a353d0..9a9266a 100644
--- a/src/views/system/process/detailProcess.vue
+++ b/src/views/system/process/detailProcess.vue
@@ -46,6 +46,7 @@
   const rowData: any = $route.query.rowData
   getRowData.value = JSON.parse(rowData)
   selectFormId.value = getRowData.value.formId
+  form.value.formID = getRowData.value.formId
   form.value.number = getRowData.value.number
   form.value.name = getRowData.value.name
   form.value.business = getRowData.value.business