diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 68499f9..1760871 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -3,16 +3,61 @@
 
 export function getReviewNoticeList(data: any) {
   return request({
-    url: `${prefix}/reviewNotice/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/reviewNotice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存
+// 筛选复查设备列表
+export function getSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情页复查设备清单
+export function detailSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/review/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 保存 草稿箱
 export function saveReviewNotice(data: object) {
   return request({
-    url: `${prefix}/reviewNotice/add`,
+    url: `${prefix}/reviewNotice/save`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑草稿箱 不走审批流程
+export function updateDraftNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function sumbitNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过/撤回后/取消后提交
+export function failUpdateNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/failUpdate`,
     method: 'post',
     data,
   })
@@ -27,7 +72,7 @@
   })
 }
 
-// 删除
+// 删除 - 草稿箱
 export function deleteReviewNotice(data: object) {
   return request({
     url: `${prefix}/reviewNotice/delete`,
@@ -36,6 +81,15 @@
   })
 }
 
+// 删除 - 已取消
+export function deleteReviewNoticeRevoked(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/delete`,
+    method: 'post',
+    data,
+  })
+}
+
 export function exportFile(data: object) {
   return request({
     url: `${prefix}/reviewNotice/exportFile`,
@@ -43,3 +97,21 @@
     data,
   })
 }
+
+// 发起者撤回，表单状态更改为已取消
+export function revokeApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/revoke`,
+    method: 'post',
+    data,
+  })
+}
+
+// 委托方名录审批-拒绝
+export function refuseApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/refuse`,
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 68499f9..1760871 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -3,16 +3,61 @@
 
 export function getReviewNoticeList(data: any) {
   return request({
-    url: `${prefix}/reviewNotice/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/reviewNotice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存
+// 筛选复查设备列表
+export function getSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情页复查设备清单
+export function detailSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/review/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 保存 草稿箱
 export function saveReviewNotice(data: object) {
   return request({
-    url: `${prefix}/reviewNotice/add`,
+    url: `${prefix}/reviewNotice/save`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑草稿箱 不走审批流程
+export function updateDraftNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function sumbitNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过/撤回后/取消后提交
+export function failUpdateNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/failUpdate`,
     method: 'post',
     data,
   })
@@ -27,7 +72,7 @@
   })
 }
 
-// 删除
+// 删除 - 草稿箱
 export function deleteReviewNotice(data: object) {
   return request({
     url: `${prefix}/reviewNotice/delete`,
@@ -36,6 +81,15 @@
   })
 }
 
+// 删除 - 已取消
+export function deleteReviewNoticeRevoked(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/delete`,
+    method: 'post',
+    data,
+  })
+}
+
 export function exportFile(data: object) {
   return request({
     url: `${prefix}/reviewNotice/exportFile`,
@@ -43,3 +97,21 @@
     data,
   })
 }
+
+// 发起者撤回，表单状态更改为已取消
+export function revokeApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/revoke`,
+    method: 'post',
+    data,
+  })
+}
+
+// 委托方名录审批-拒绝
+export function refuseApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/refuse`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index af59c20..dbf39ec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -27,6 +27,7 @@
   CUSTOMER_OPINION_REGISTER_APPROVAL = 'zyglwtfyjdjb', // 委托方意见登记表
   CONTRACT_REVIEW_APPROVAL = 'zyglyqwtsjhtpsb', // 要求、委托书及合同评审表
   SEAL_USE_REGISTER_APPROVAL = 'zyglyzsydj', // 印章使用登记
+  REVIEW_NOTICE_APPROVAL = 'zygljcjgfctzd', // 检测结果复查通知单审批流程
 
   // 质量活动
   QUALITY_SUPERVISION_RECORD_APPROVAL = 'zlhdzlbgspgl', // 质量监督报告

diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 68499f9..1760871 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -3,16 +3,61 @@
 
 export function getReviewNoticeList(data: any) {
   return request({
-    url: `${prefix}/reviewNotice/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/reviewNotice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存
+// 筛选复查设备列表
+export function getSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情页复查设备清单
+export function detailSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/review/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 保存 草稿箱
 export function saveReviewNotice(data: object) {
   return request({
-    url: `${prefix}/reviewNotice/add`,
+    url: `${prefix}/reviewNotice/save`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑草稿箱 不走审批流程
+export function updateDraftNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function sumbitNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过/撤回后/取消后提交
+export function failUpdateNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/failUpdate`,
     method: 'post',
     data,
   })
@@ -27,7 +72,7 @@
   })
 }
 
-// 删除
+// 删除 - 草稿箱
 export function deleteReviewNotice(data: object) {
   return request({
     url: `${prefix}/reviewNotice/delete`,
@@ -36,6 +81,15 @@
   })
 }
 
+// 删除 - 已取消
+export function deleteReviewNoticeRevoked(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/delete`,
+    method: 'post',
+    data,
+  })
+}
+
 export function exportFile(data: object) {
   return request({
     url: `${prefix}/reviewNotice/exportFile`,
@@ -43,3 +97,21 @@
     data,
   })
 }
+
+// 发起者撤回，表单状态更改为已取消
+export function revokeApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/revoke`,
+    method: 'post',
+    data,
+  })
+}
+
+// 委托方名录审批-拒绝
+export function refuseApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/refuse`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index af59c20..dbf39ec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -27,6 +27,7 @@
   CUSTOMER_OPINION_REGISTER_APPROVAL = 'zyglwtfyjdjb', // 委托方意见登记表
   CONTRACT_REVIEW_APPROVAL = 'zyglyqwtsjhtpsb', // 要求、委托书及合同评审表
   SEAL_USE_REGISTER_APPROVAL = 'zyglyzsydj', // 印章使用登记
+  REVIEW_NOTICE_APPROVAL = 'zygljcjgfctzd', // 检测结果复查通知单审批流程
 
   // 质量活动
   QUALITY_SUPERVISION_RECORD_APPROVAL = 'zlhdzlbgspgl', // 质量监督报告
diff --git a/src/views/resource/common/filterSample.vue b/src/views/resource/common/filterSample.vue
new file mode 100644
index 0000000..48d8bcc
--- /dev/null
+++ b/src/views/resource/common/filterSample.vue
@@ -0,0 +1,217 @@
+<!-- 筛选样品弹窗 -->
+<script name="FilterSample" lang="ts" setup>
+import { ElMessage, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { IDictType } from '@/commonInterface/resource-interface'
+import type { ISampleEquipment, ISampleEquipmentQuery } from '@/views/resource/customer/reviewNotice/customer-notice'
+import { getDictByCode } from '@/api/system/dict'
+import { getSampleEqptList } from '@/api/resource/reviewNotice'
+import { findDictNameByCode } from '@/commonMethods/useDictCheck'
+
+const emit = defineEmits(['recordsSelected'])
+
+const showFilterDialog = ref(false)
+const listQuery = ref<ISampleEquipmentQuery>({
+  customerId: '',
+  equipmentNo: '',
+  equipmentName: '',
+  certificateValidStart: '',
+  certificateValidEnd: '',
+  equipmentType: '',
+  limit: 10,
+  offset: 1,
+})
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const customerName = ref<string>('')
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '设备统一编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '所在单位', value: 'companyName', align: 'center', width: '160' },
+  { text: '负责人', value: 'directorName', align: 'center', width: '160' },
+  { text: '最近送检时间', value: 'checkDateStr', align: 'center', width: '120' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', width: '100' },
+  { text: '证书有效日期', value: 'certificateValidStr', align: 'center', width: '120' },
+  { text: '检验员', value: 'measurePersonName', align: 'center', width: '120' },
+]) // 表头
+
+const equipmentList = ref<Array<ISampleEquipment>>([])
+
+const rowSelected = ref([])
+
+const eqptCategoryDict = ref<IDictType[]>([])
+const eqptMeterIdentifyDict = ref<IDictType[]>([])
+
+// 逻辑
+// 查询设备列表
+const getList = () => {
+  getSampleEqptList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      equipmentList.value = res.data.rows.map((item: ISampleEquipment) => {
+        return {
+          ...item,
+          checkDateStr: dayjs(item.checkDate).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.checkDate).format('YYYY-MM-DD'),
+          certificateValidStr: dayjs(item.certificateValid).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.certificateValid).format('YYYY-MM-DD'),
+          meterIdentifyName: findDictNameByCode(item.meterIdentify, eqptMeterIdentifyDict.value),
+        }
+      })
+      total.value = res.data.total
+    }
+    else {
+      equipmentList.value = []
+    }
+  })
+}
+
+const getEqptDeviceCategoryDict = async () => {
+  // 先从缓存中获取
+  if (sessionStorage.getItem('eqptDeviceCategory') === null || sessionStorage.getItem('eqptDeviceCategory') === undefined) {
+    // 缓存中没有则调用接口查询
+    await getDictByCode('eqptDeviceCategory').then((res) => {
+      if (res.code === 200) {
+        eqptCategoryDict.value = res.data
+        sessionStorage.setItem('eqptDeviceCategory', JSON.stringify(eqptCategoryDict.value)) // 放到缓存中
+      }
+    })
+  }
+  else {
+    eqptCategoryDict.value = JSON.parse(sessionStorage.getItem('eqptDeviceCategory')!)
+  }
+}
+
+const getEqptMeterIdentifyDict = async () => {
+  // 先从缓存中获取
+  if (sessionStorage.getItem('eqptMeterIdentify') === null || sessionStorage.getItem('eqptMeterIdentify') === undefined) {
+    // 缓存中没有则调用接口查询
+    await getDictByCode('eqptMeterIdentify').then((res) => {
+      if (res.code === 200) {
+        eqptMeterIdentifyDict.value = res.data
+        sessionStorage.setItem('eqptMeterIdentify', JSON.stringify(eqptMeterIdentifyDict.value)) // 放到缓存中
+      }
+    })
+  }
+  else {
+    eqptMeterIdentifyDict.value = JSON.parse(sessionStorage.getItem('eqptMeterIdentify')!)
+  }
+}
+
+const showOrHideFilterDialog = (show: boolean, customerDeptId = '', name = '') => {
+  if (show === false) {
+    listQuery.value.equipmentName = ''
+    listQuery.value.customerId = ''
+    listQuery.value.equipmentNo = ''
+    listQuery.value.equipmentType = ''
+    listQuery.value.limit = 10
+    listQuery.value.offset = 1
+
+    customerName.value = ''
+  }
+  else {
+    getEqptDeviceCategoryDict()
+    getEqptMeterIdentifyDict()
+    listQuery.value.customerId = customerDeptId
+    customerName.value = name
+
+    getList()
+  }
+
+  showFilterDialog.value = show
+}
+
+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
+  }
+  getList()
+}
+
+const eqptSelected = (e: any) => {
+  rowSelected.value = e
+}
+
+const submitEquipmentSelected = () => {
+  if (rowSelected.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+
+  emit('recordsSelected', rowSelected.value)
+  showOrHideFilterDialog(false)
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.certificateValidStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.certificateValidEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
+})
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="85%">
+    <search-area :need-clear="false" @search="getList">
+      <search-item>
+        <el-input v-model="listQuery.customerId" type="hidden" />
+        <el-input v-model="customerName" :disabled="true" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.equipmentType" placeholder="设备类型" clearable>
+          <el-option v-for="dict in eqptCategoryDict" :key="dict.id" :value="dict.value" :label="dict.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="证书有效期（开始）" end-placeholder="证书有效期（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 表格数据展示 -->
+    <table-container :title-show="false">
+      <!-- 表格区域 -->
+      <normal-table
+        :data="equipmentList" :total="total" :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
+        :is-showmulti-select="true"
+        @change="changePage"
+        @multi-select="eqptSelected"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>

diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 68499f9..1760871 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -3,16 +3,61 @@
 
 export function getReviewNoticeList(data: any) {
   return request({
-    url: `${prefix}/reviewNotice/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/reviewNotice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存
+// 筛选复查设备列表
+export function getSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情页复查设备清单
+export function detailSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/review/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 保存 草稿箱
 export function saveReviewNotice(data: object) {
   return request({
-    url: `${prefix}/reviewNotice/add`,
+    url: `${prefix}/reviewNotice/save`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑草稿箱 不走审批流程
+export function updateDraftNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function sumbitNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过/撤回后/取消后提交
+export function failUpdateNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/failUpdate`,
     method: 'post',
     data,
   })
@@ -27,7 +72,7 @@
   })
 }
 
-// 删除
+// 删除 - 草稿箱
 export function deleteReviewNotice(data: object) {
   return request({
     url: `${prefix}/reviewNotice/delete`,
@@ -36,6 +81,15 @@
   })
 }
 
+// 删除 - 已取消
+export function deleteReviewNoticeRevoked(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/delete`,
+    method: 'post',
+    data,
+  })
+}
+
 export function exportFile(data: object) {
   return request({
     url: `${prefix}/reviewNotice/exportFile`,
@@ -43,3 +97,21 @@
     data,
   })
 }
+
+// 发起者撤回，表单状态更改为已取消
+export function revokeApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/revoke`,
+    method: 'post',
+    data,
+  })
+}
+
+// 委托方名录审批-拒绝
+export function refuseApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/refuse`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index af59c20..dbf39ec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -27,6 +27,7 @@
   CUSTOMER_OPINION_REGISTER_APPROVAL = 'zyglwtfyjdjb', // 委托方意见登记表
   CONTRACT_REVIEW_APPROVAL = 'zyglyqwtsjhtpsb', // 要求、委托书及合同评审表
   SEAL_USE_REGISTER_APPROVAL = 'zyglyzsydj', // 印章使用登记
+  REVIEW_NOTICE_APPROVAL = 'zygljcjgfctzd', // 检测结果复查通知单审批流程
 
   // 质量活动
   QUALITY_SUPERVISION_RECORD_APPROVAL = 'zlhdzlbgspgl', // 质量监督报告
diff --git a/src/views/resource/common/filterSample.vue b/src/views/resource/common/filterSample.vue
new file mode 100644
index 0000000..48d8bcc
--- /dev/null
+++ b/src/views/resource/common/filterSample.vue
@@ -0,0 +1,217 @@
+<!-- 筛选样品弹窗 -->
+<script name="FilterSample" lang="ts" setup>
+import { ElMessage, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { IDictType } from '@/commonInterface/resource-interface'
+import type { ISampleEquipment, ISampleEquipmentQuery } from '@/views/resource/customer/reviewNotice/customer-notice'
+import { getDictByCode } from '@/api/system/dict'
+import { getSampleEqptList } from '@/api/resource/reviewNotice'
+import { findDictNameByCode } from '@/commonMethods/useDictCheck'
+
+const emit = defineEmits(['recordsSelected'])
+
+const showFilterDialog = ref(false)
+const listQuery = ref<ISampleEquipmentQuery>({
+  customerId: '',
+  equipmentNo: '',
+  equipmentName: '',
+  certificateValidStart: '',
+  certificateValidEnd: '',
+  equipmentType: '',
+  limit: 10,
+  offset: 1,
+})
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const customerName = ref<string>('')
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '设备统一编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '所在单位', value: 'companyName', align: 'center', width: '160' },
+  { text: '负责人', value: 'directorName', align: 'center', width: '160' },
+  { text: '最近送检时间', value: 'checkDateStr', align: 'center', width: '120' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', width: '100' },
+  { text: '证书有效日期', value: 'certificateValidStr', align: 'center', width: '120' },
+  { text: '检验员', value: 'measurePersonName', align: 'center', width: '120' },
+]) // 表头
+
+const equipmentList = ref<Array<ISampleEquipment>>([])
+
+const rowSelected = ref([])
+
+const eqptCategoryDict = ref<IDictType[]>([])
+const eqptMeterIdentifyDict = ref<IDictType[]>([])
+
+// 逻辑
+// 查询设备列表
+const getList = () => {
+  getSampleEqptList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      equipmentList.value = res.data.rows.map((item: ISampleEquipment) => {
+        return {
+          ...item,
+          checkDateStr: dayjs(item.checkDate).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.checkDate).format('YYYY-MM-DD'),
+          certificateValidStr: dayjs(item.certificateValid).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.certificateValid).format('YYYY-MM-DD'),
+          meterIdentifyName: findDictNameByCode(item.meterIdentify, eqptMeterIdentifyDict.value),
+        }
+      })
+      total.value = res.data.total
+    }
+    else {
+      equipmentList.value = []
+    }
+  })
+}
+
+const getEqptDeviceCategoryDict = async () => {
+  // 先从缓存中获取
+  if (sessionStorage.getItem('eqptDeviceCategory') === null || sessionStorage.getItem('eqptDeviceCategory') === undefined) {
+    // 缓存中没有则调用接口查询
+    await getDictByCode('eqptDeviceCategory').then((res) => {
+      if (res.code === 200) {
+        eqptCategoryDict.value = res.data
+        sessionStorage.setItem('eqptDeviceCategory', JSON.stringify(eqptCategoryDict.value)) // 放到缓存中
+      }
+    })
+  }
+  else {
+    eqptCategoryDict.value = JSON.parse(sessionStorage.getItem('eqptDeviceCategory')!)
+  }
+}
+
+const getEqptMeterIdentifyDict = async () => {
+  // 先从缓存中获取
+  if (sessionStorage.getItem('eqptMeterIdentify') === null || sessionStorage.getItem('eqptMeterIdentify') === undefined) {
+    // 缓存中没有则调用接口查询
+    await getDictByCode('eqptMeterIdentify').then((res) => {
+      if (res.code === 200) {
+        eqptMeterIdentifyDict.value = res.data
+        sessionStorage.setItem('eqptMeterIdentify', JSON.stringify(eqptMeterIdentifyDict.value)) // 放到缓存中
+      }
+    })
+  }
+  else {
+    eqptMeterIdentifyDict.value = JSON.parse(sessionStorage.getItem('eqptMeterIdentify')!)
+  }
+}
+
+const showOrHideFilterDialog = (show: boolean, customerDeptId = '', name = '') => {
+  if (show === false) {
+    listQuery.value.equipmentName = ''
+    listQuery.value.customerId = ''
+    listQuery.value.equipmentNo = ''
+    listQuery.value.equipmentType = ''
+    listQuery.value.limit = 10
+    listQuery.value.offset = 1
+
+    customerName.value = ''
+  }
+  else {
+    getEqptDeviceCategoryDict()
+    getEqptMeterIdentifyDict()
+    listQuery.value.customerId = customerDeptId
+    customerName.value = name
+
+    getList()
+  }
+
+  showFilterDialog.value = show
+}
+
+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
+  }
+  getList()
+}
+
+const eqptSelected = (e: any) => {
+  rowSelected.value = e
+}
+
+const submitEquipmentSelected = () => {
+  if (rowSelected.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+
+  emit('recordsSelected', rowSelected.value)
+  showOrHideFilterDialog(false)
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.certificateValidStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.certificateValidEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
+})
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="85%">
+    <search-area :need-clear="false" @search="getList">
+      <search-item>
+        <el-input v-model="listQuery.customerId" type="hidden" />
+        <el-input v-model="customerName" :disabled="true" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.equipmentType" placeholder="设备类型" clearable>
+          <el-option v-for="dict in eqptCategoryDict" :key="dict.id" :value="dict.value" :label="dict.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="证书有效期（开始）" end-placeholder="证书有效期（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 表格数据展示 -->
+    <table-container :title-show="false">
+      <!-- 表格区域 -->
+      <normal-table
+        :data="equipmentList" :total="total" :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
+        :is-showmulti-select="true"
+        @change="changePage"
+        @multi-select="eqptSelected"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/resource/customer/reviewNotice/customer-notice.ts b/src/views/resource/customer/reviewNotice/customer-notice.ts
index c92cbe4..a31f926 100644
--- a/src/views/resource/customer/reviewNotice/customer-notice.ts
+++ b/src/views/resource/customer/reviewNotice/customer-notice.ts
@@ -3,12 +3,48 @@
   createUserName: string
   createTimeStart: string
   createTimeEnd: string
+  sendStatus: string
+  formId: string
+  approvalStatus: string
   offset: number
   limit: number
   sort?: string
   order?: string
 }
 
+export interface ISampleEquipmentQuery {
+  customerId: string
+  equipmentName: string
+  certificateValidStart: string
+  certificateValidEnd: string
+  equipmentNo: string
+  equipmentType: string
+  offset: number
+  limit: number
+}
+
+export interface ISampleEquipment {
+  id: string
+  equipmentId: string
+  equipmentNo: string
+  equipmentName: string
+  category: string
+  model: string
+  manufactureNo: string
+  manufacturer: string
+  companyId: string
+  companyName: string
+  directorId: string
+  directorName: string
+  checkDate: string
+  checkCycle: string
+  checkOrganization: string
+  checkDestination: string
+  meterIdentify: string
+  measurePersonName: string
+  certificateValid: string
+}
+
 export interface ICustomerNoticeInfo {
   id?: string
   customerId: string
@@ -26,6 +62,16 @@
   deviceNo?: string
   returnDate?: string
   noticeDate?: string
+  sampleIdList: Array<string>
+  sendStatus: string
+  sendStatusValue?: string
+  approvalStatus?: string
+  approvalStatusName?: string
+  appealUserId: string
+  appealUserName: string
+  processId: string
+  taskId: string
+  decisionItem?: string
   createUserId?: string
   createUserName?: string
   createTime?: string

diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 68499f9..1760871 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -3,16 +3,61 @@
 
 export function getReviewNoticeList(data: any) {
   return request({
-    url: `${prefix}/reviewNotice/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/reviewNotice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存
+// 筛选复查设备列表
+export function getSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情页复查设备清单
+export function detailSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/review/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 保存 草稿箱
 export function saveReviewNotice(data: object) {
   return request({
-    url: `${prefix}/reviewNotice/add`,
+    url: `${prefix}/reviewNotice/save`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑草稿箱 不走审批流程
+export function updateDraftNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function sumbitNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过/撤回后/取消后提交
+export function failUpdateNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/failUpdate`,
     method: 'post',
     data,
   })
@@ -27,7 +72,7 @@
   })
 }
 
-// 删除
+// 删除 - 草稿箱
 export function deleteReviewNotice(data: object) {
   return request({
     url: `${prefix}/reviewNotice/delete`,
@@ -36,6 +81,15 @@
   })
 }
 
+// 删除 - 已取消
+export function deleteReviewNoticeRevoked(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/delete`,
+    method: 'post',
+    data,
+  })
+}
+
 export function exportFile(data: object) {
   return request({
     url: `${prefix}/reviewNotice/exportFile`,
@@ -43,3 +97,21 @@
     data,
   })
 }
+
+// 发起者撤回，表单状态更改为已取消
+export function revokeApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/revoke`,
+    method: 'post',
+    data,
+  })
+}
+
+// 委托方名录审批-拒绝
+export function refuseApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/refuse`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index af59c20..dbf39ec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -27,6 +27,7 @@
   CUSTOMER_OPINION_REGISTER_APPROVAL = 'zyglwtfyjdjb', // 委托方意见登记表
   CONTRACT_REVIEW_APPROVAL = 'zyglyqwtsjhtpsb', // 要求、委托书及合同评审表
   SEAL_USE_REGISTER_APPROVAL = 'zyglyzsydj', // 印章使用登记
+  REVIEW_NOTICE_APPROVAL = 'zygljcjgfctzd', // 检测结果复查通知单审批流程
 
   // 质量活动
   QUALITY_SUPERVISION_RECORD_APPROVAL = 'zlhdzlbgspgl', // 质量监督报告
diff --git a/src/views/resource/common/filterSample.vue b/src/views/resource/common/filterSample.vue
new file mode 100644
index 0000000..48d8bcc
--- /dev/null
+++ b/src/views/resource/common/filterSample.vue
@@ -0,0 +1,217 @@
+<!-- 筛选样品弹窗 -->
+<script name="FilterSample" lang="ts" setup>
+import { ElMessage, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { IDictType } from '@/commonInterface/resource-interface'
+import type { ISampleEquipment, ISampleEquipmentQuery } from '@/views/resource/customer/reviewNotice/customer-notice'
+import { getDictByCode } from '@/api/system/dict'
+import { getSampleEqptList } from '@/api/resource/reviewNotice'
+import { findDictNameByCode } from '@/commonMethods/useDictCheck'
+
+const emit = defineEmits(['recordsSelected'])
+
+const showFilterDialog = ref(false)
+const listQuery = ref<ISampleEquipmentQuery>({
+  customerId: '',
+  equipmentNo: '',
+  equipmentName: '',
+  certificateValidStart: '',
+  certificateValidEnd: '',
+  equipmentType: '',
+  limit: 10,
+  offset: 1,
+})
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const customerName = ref<string>('')
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '设备统一编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '所在单位', value: 'companyName', align: 'center', width: '160' },
+  { text: '负责人', value: 'directorName', align: 'center', width: '160' },
+  { text: '最近送检时间', value: 'checkDateStr', align: 'center', width: '120' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', width: '100' },
+  { text: '证书有效日期', value: 'certificateValidStr', align: 'center', width: '120' },
+  { text: '检验员', value: 'measurePersonName', align: 'center', width: '120' },
+]) // 表头
+
+const equipmentList = ref<Array<ISampleEquipment>>([])
+
+const rowSelected = ref([])
+
+const eqptCategoryDict = ref<IDictType[]>([])
+const eqptMeterIdentifyDict = ref<IDictType[]>([])
+
+// 逻辑
+// 查询设备列表
+const getList = () => {
+  getSampleEqptList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      equipmentList.value = res.data.rows.map((item: ISampleEquipment) => {
+        return {
+          ...item,
+          checkDateStr: dayjs(item.checkDate).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.checkDate).format('YYYY-MM-DD'),
+          certificateValidStr: dayjs(item.certificateValid).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.certificateValid).format('YYYY-MM-DD'),
+          meterIdentifyName: findDictNameByCode(item.meterIdentify, eqptMeterIdentifyDict.value),
+        }
+      })
+      total.value = res.data.total
+    }
+    else {
+      equipmentList.value = []
+    }
+  })
+}
+
+const getEqptDeviceCategoryDict = async () => {
+  // 先从缓存中获取
+  if (sessionStorage.getItem('eqptDeviceCategory') === null || sessionStorage.getItem('eqptDeviceCategory') === undefined) {
+    // 缓存中没有则调用接口查询
+    await getDictByCode('eqptDeviceCategory').then((res) => {
+      if (res.code === 200) {
+        eqptCategoryDict.value = res.data
+        sessionStorage.setItem('eqptDeviceCategory', JSON.stringify(eqptCategoryDict.value)) // 放到缓存中
+      }
+    })
+  }
+  else {
+    eqptCategoryDict.value = JSON.parse(sessionStorage.getItem('eqptDeviceCategory')!)
+  }
+}
+
+const getEqptMeterIdentifyDict = async () => {
+  // 先从缓存中获取
+  if (sessionStorage.getItem('eqptMeterIdentify') === null || sessionStorage.getItem('eqptMeterIdentify') === undefined) {
+    // 缓存中没有则调用接口查询
+    await getDictByCode('eqptMeterIdentify').then((res) => {
+      if (res.code === 200) {
+        eqptMeterIdentifyDict.value = res.data
+        sessionStorage.setItem('eqptMeterIdentify', JSON.stringify(eqptMeterIdentifyDict.value)) // 放到缓存中
+      }
+    })
+  }
+  else {
+    eqptMeterIdentifyDict.value = JSON.parse(sessionStorage.getItem('eqptMeterIdentify')!)
+  }
+}
+
+const showOrHideFilterDialog = (show: boolean, customerDeptId = '', name = '') => {
+  if (show === false) {
+    listQuery.value.equipmentName = ''
+    listQuery.value.customerId = ''
+    listQuery.value.equipmentNo = ''
+    listQuery.value.equipmentType = ''
+    listQuery.value.limit = 10
+    listQuery.value.offset = 1
+
+    customerName.value = ''
+  }
+  else {
+    getEqptDeviceCategoryDict()
+    getEqptMeterIdentifyDict()
+    listQuery.value.customerId = customerDeptId
+    customerName.value = name
+
+    getList()
+  }
+
+  showFilterDialog.value = show
+}
+
+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
+  }
+  getList()
+}
+
+const eqptSelected = (e: any) => {
+  rowSelected.value = e
+}
+
+const submitEquipmentSelected = () => {
+  if (rowSelected.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+
+  emit('recordsSelected', rowSelected.value)
+  showOrHideFilterDialog(false)
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.certificateValidStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.certificateValidEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
+})
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="85%">
+    <search-area :need-clear="false" @search="getList">
+      <search-item>
+        <el-input v-model="listQuery.customerId" type="hidden" />
+        <el-input v-model="customerName" :disabled="true" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.equipmentType" placeholder="设备类型" clearable>
+          <el-option v-for="dict in eqptCategoryDict" :key="dict.id" :value="dict.value" :label="dict.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="证书有效期（开始）" end-placeholder="证书有效期（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 表格数据展示 -->
+    <table-container :title-show="false">
+      <!-- 表格区域 -->
+      <normal-table
+        :data="equipmentList" :total="total" :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
+        :is-showmulti-select="true"
+        @change="changePage"
+        @multi-select="eqptSelected"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/resource/customer/reviewNotice/customer-notice.ts b/src/views/resource/customer/reviewNotice/customer-notice.ts
index c92cbe4..a31f926 100644
--- a/src/views/resource/customer/reviewNotice/customer-notice.ts
+++ b/src/views/resource/customer/reviewNotice/customer-notice.ts
@@ -3,12 +3,48 @@
   createUserName: string
   createTimeStart: string
   createTimeEnd: string
+  sendStatus: string
+  formId: string
+  approvalStatus: string
   offset: number
   limit: number
   sort?: string
   order?: string
 }
 
+export interface ISampleEquipmentQuery {
+  customerId: string
+  equipmentName: string
+  certificateValidStart: string
+  certificateValidEnd: string
+  equipmentNo: string
+  equipmentType: string
+  offset: number
+  limit: number
+}
+
+export interface ISampleEquipment {
+  id: string
+  equipmentId: string
+  equipmentNo: string
+  equipmentName: string
+  category: string
+  model: string
+  manufactureNo: string
+  manufacturer: string
+  companyId: string
+  companyName: string
+  directorId: string
+  directorName: string
+  checkDate: string
+  checkCycle: string
+  checkOrganization: string
+  checkDestination: string
+  meterIdentify: string
+  measurePersonName: string
+  certificateValid: string
+}
+
 export interface ICustomerNoticeInfo {
   id?: string
   customerId: string
@@ -26,6 +62,16 @@
   deviceNo?: string
   returnDate?: string
   noticeDate?: string
+  sampleIdList: Array<string>
+  sendStatus: string
+  sendStatusValue?: string
+  approvalStatus?: string
+  approvalStatusName?: string
+  appealUserId: string
+  appealUserName: string
+  processId: string
+  taskId: string
+  decisionItem?: string
   createUserId?: string
   createUserName?: string
   createTime?: string
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 930d9c6..227e2fa 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,30 +1,49 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerNoticeInfo } from './customer-notice'
+import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
+import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
-import { exportFile, saveReviewNotice, updateReviewNotice } from '@/api/resource/reviewNotice'
+import { deleteReviewNotice, deleteReviewNoticeRevoked, detailSampleEqptList, exportFile, failUpdateNotice, refuseApproval, revokeApproval, saveReviewNotice, sumbitNotice, updateDraftNotice, updateReviewNotice } from '@/api/resource/reviewNotice'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { getDictByCode } from '@/api/system/dict'
+import { findDictNameByCode } from '@/commonMethods/useDictCheck'
 import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
 import FilterCustomer from '@/views/resource/common/filterCustomer.vue'
+import FilterSample from '@/views/resource/common/filterSample.vue'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
+const status = ref<string>('')
+
+// 关键字段是否可以编辑
+const keyFieldsDisable = ref<boolean>(true)
 
 const userInfo = useUserStore()
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
 
-// 关键字段是否可以编辑
-const keyFieldsDisable = ref<boolean>(true)
+const radioItems = ref([
+  { name: '基本信息', value: 'notice-basic' },
+  { name: '审批详情', value: 'notice-approval' },
+])
 
+const current = ref('')
+const currentLabel = ref('')
+
+const flowFormId = SCHEDULE.REVIEW_NOTICE_APPROVAL // 资源管理 - 要求、委托书及合同评审表
+
+// 弹窗子组件
+const apprDial = ref()
 const noticeFormRef = ref()
-const noticeRef = ref()
 const refFilterSysUser = ref()
 const refFilterCustomer = ref()
+const refFilterSample = ref()
 
 const noticeInfo = ref<ICustomerNoticeInfo>({
   id: '',
@@ -43,6 +62,14 @@
   deviceNo: '',
   returnDate: '',
   noticeDate: '',
+  sampleIdList: [],
+  sendStatus: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  appealUserId: '',
+  appealUserName: '',
+  processId: '',
+  taskId: '',
   createUserId: '',
   createUserName: '',
   createTime: '',
@@ -50,22 +77,125 @@
 
 const noticeFormRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
+  deptId: [{ required: true, message: '委托单位不能为空，请选择', trigger: ['change', 'blur'] }],
+  returnDate: [{ required: true, message: '寄回日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const noticeRules = ref({
-  deptId: [{ required: true, message: '委托单位不能为空，请选择', trigger: ['change', 'blur'] }],
-  submitDate: [{ required: true, message: '送检日期不能为空，请选择', trigger: 'blur' }],
-  deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
-  deviceNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
-  deviceModel: [{ required: true, message: '设备型号不能为空', trigger: 'blur' }],
-  returnDate: [{ required: true, message: '寄回日期不能为空', trigger: 'blur' }],
-  noticeDate: [{ required: true, message: '通知日期不能为空，请选择', trigger: 'blur' }],
-}) // 表单验证规则
+// 是否显示相关按钮
+const saveButtVisable = ref<boolean>(false) // 是否显示 保存 按钮
+const submitButtVisable = ref<boolean>(false) // 是否显示 提交 按钮
+const flowButtsVisable = ref<boolean>(false) // 是否显示 同意和拒绝 按钮
+const cancelButtVisable = ref<boolean>(false) // 是否显示 取消 按钮
+const deleteButtVisable = ref<boolean>(false) // 是否显示 删除 按钮
+const editButtVisable = ref<boolean>(false) // 是否显示 编辑 按钮
 
 // 字典值
 const labCodeDict = ref<IDictType[]>([])
+const eqptMeterIdentifyDict = ref<IDictType[]>([])
+
+const sampleList = ref<ISampleEquipment[]>([])
+const samplesColumns = ref<TableColumn[]>([
+  { text: '设备统一编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '所在单位', value: 'companyName', align: 'center', width: '160' },
+  { text: '负责人', value: 'directorName', align: 'center', width: '160' },
+  { text: '最近送检时间', value: 'checkDateStr', align: 'center', width: '120' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', width: '100' },
+  { text: '证书有效日期', value: 'certificateValidStr', align: 'center', width: '120' },
+  { text: '检验员', value: 'measurePersonName', align: 'center', width: '120' },
+])
+
+const sampleSelectedList = ref<ISampleEquipment[]>([])
 
 // 逻辑
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 将所有流程操作的按钮隐藏
+const hideAllOpterationButtons = () => {
+  saveButtVisable.value = false
+  submitButtVisable.value = false
+  flowButtsVisable.value = false
+  cancelButtVisable.value = false
+  deleteButtVisable.value = false
+  editButtVisable.value = false
+}
+
+// 根据审批状态显示对应的流程操作按钮
+const showOperationButtonByStatus = () => {
+  switch (status.value) {
+    case '1':
+      // 草稿箱：保存、提交按钮可见
+      saveButtVisable.value = true
+      submitButtVisable.value = true
+      break
+
+    case '2':
+      // 待审批：同意、拒绝按钮可见
+      flowButtsVisable.value = true
+      break
+
+    case '3':
+      // 审批中：取消按钮可见
+      cancelButtVisable.value = true
+      break
+
+    case '5':
+      // 未通过：编辑 按钮可见
+      editButtVisable.value = true
+      break
+
+    case '6':
+      // 已取消：编辑 删除按钮可见
+      editButtVisable.value = true
+      deleteButtVisable.value = true
+      break
+
+    default:
+      // 默认不显示所有的操作按钮
+      hideAllOpterationButtons()
+      break
+  }
+}
+
+// 关闭
+const resetForm = () => {
+  sessionStorage.removeItem('reviewNoticeInfo') // 返回列表时 将缓存中的数据删除
+  router.go(-1)
+}
+
+// 查询复查设备清单详情
+const getSampleEqptList = (noticeId: string) => {
+  if (noticeId === '' || noticeId === undefined) {
+    return
+  }
+
+  detailSampleEqptList({ id: noticeId, limit: 1000, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      sampleList.value = res.data.rows.map((item: ISampleEquipment) => {
+        return {
+          ...item,
+          checkDateStr: dayjs(item.checkDate).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.checkDate).format('YYYY-MM-DD'),
+          certificateValidStr: dayjs(item.certificateValid).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.certificateValid).format('YYYY-MM-DD'),
+          meterIdentifyName: findDictNameByCode(item.meterIdentify, eqptMeterIdentifyDict.value),
+        }
+      })
+    }
+  })
+}
 
 // 保存至草稿箱
 const saveNoticeInfo = () => {
@@ -79,7 +209,8 @@
       noticeInfo.value.id = res.data.id
       id.value = res.data.id
 
-      type.value = 'detail'
+      type.value = 'update'
+      status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
     }
     else {
       // 提示失败信息
@@ -88,9 +219,9 @@
   })
 }
 
-// 编辑
+// 编辑草稿箱（不走流程审批）
 const updateNoticeInfo = () => {
-  updateReviewNotice(noticeInfo.value).then((res) => {
+  updateDraftNotice(noticeInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -102,26 +233,29 @@
   })
 }
 
+// 编辑按钮点击事件处理函数
+const editClickedHandler = () => {
+  type.value = 'update'
+  title.value = '检测结果复查通知单（编辑）'
+
+  // 隐藏编辑按钮 显示提交按钮
+  editButtVisable.value = false
+  submitButtVisable.value = true
+}
+
 // 新建时保存后的处理 获取返回的id
 const saveButtonHandler = async () => {
-  if (!noticeRef) { return }
+  if (sampleList.value.length === 0) {
+    ElMessage.warning('复检设备不能为空，请重新选择')
+    return
+  }
 
-  let formValid
-
-  // 先对表单一进行校验
-  await noticeFormRef.value.validate((valid: boolean) => {
-    if (valid === false) {
-      formValid = false
-    }
-    else {
-      formValid = true
-    }
+  noticeInfo.value.sampleIdList = sampleList.value.map((item) => {
+    return item.id
   })
 
-  if (formValid === false) { return }
-
-  // 表单一通过校验后 对表单二进行校验
-  await noticeRef.value.validate((valid: boolean, fields: any) => {
+  // 对表单进行校验
+  await noticeFormRef.value.validate((valid: boolean, fields: any) => {
     if (valid === true) {
       ElMessageBox.confirm(
         '确认保存吗？',
@@ -143,6 +277,115 @@
   })
 }
 
+// 提交按钮
+const submitButtonHandler = async () => {
+  if (noticeInfo.value === null || noticeInfo.value.processId === undefined || noticeInfo.value.processId === '') {
+    // 流程id为空 表示还未进入流程中 直接提交
+    ElMessageBox.confirm(`是否提交通知单 ${noticeInfo.value.noticeNo}`, '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      sumbitNotice({
+        formId: flowFormId,
+        id: noticeInfo.value.id,
+      }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success(`通知单 ${noticeInfo.value.noticeNo} 提交成功`)
+
+          type.value = 'detail'
+          hideAllOpterationButtons()
+        }
+        else {
+          ElMessage.error(`通知单 ${noticeInfo.value.noticeNo} 提交失败：${res.message}`)
+        }
+      })
+    })
+  }
+  else {
+    // 之前已经在流程中的表单 保存提交
+    if (sampleList.value.length === 0) {
+      ElMessage.warning('复检设备不能为空，请重新选择')
+      return
+    }
+
+    noticeInfo.value.sampleIdList = sampleList.value.map((item) => {
+      return item.id
+    })
+
+    await noticeFormRef.value.validate((valid: boolean) => {
+      if (valid === true) {
+        failUpdateNotice(noticeInfo.value).then((res) => {
+          if (res.code === 200) {
+          // 提示保存成功
+            ElMessage.success(`通知单 ${noticeInfo.value.noticeNo} 提交成功`)
+
+            type.value = 'detail'
+            hideAllOpterationButtons()
+          }
+          else {
+          // 提示失败信息
+            ElMessage.error(`通知单 ${noticeInfo.value.noticeNo} 提交失败：${res.message}`)
+          }
+        })
+      }
+    })
+  }
+}
+
+// 流程审批-同意
+const approvalAgreeHandler = () => {
+  apprDial.value.initDialog('agree', noticeInfo.value.id, noticeInfo.value.taskId, '')
+}
+
+// 流程审批-拒绝
+const approvalRefuseHandler = () => {
+  apprDial.value.initDialog('refuse', noticeInfo.value.id, noticeInfo.value.taskId, '')
+}
+
+// 取消（撤回审批单）
+const revokeClickedHandler = () => {
+  apprDial.value.initDialog('revoke', noticeInfo.value.id, noticeInfo.value.taskId, noticeInfo.value.processId)
+}
+
+// 删除（只有已取消的可以在详情中删除）
+const deleteClickedHandler = () => {
+  ElMessageBox.confirm(
+    `确认删除通知单 ${noticeInfo.value.noticeNo} 吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    if (status.value === '0') {
+      // 草稿箱删除
+      deleteReviewNotice({ id: noticeInfo.value.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success(`通知单 ${noticeInfo.value.noticeNo} 删除成功`)
+          resetForm()
+        }
+        else {
+          ElMessage.error(`通知单 ${noticeInfo.value.noticeNo} 删除失败：${res.message}`)
+        }
+      })
+    }
+    else if (status.value === '6') {
+      // 已取消删除
+      deleteReviewNoticeRevoked({ id: noticeInfo.value.id, taskId: noticeInfo.value.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success(`通知单 ${noticeInfo.value.noticeNo} 删除成功`)
+          resetForm()
+        }
+        else {
+          ElMessage.error(`通知单 ${noticeInfo.value.noticeNo} 删除失败：${res.message}`)
+        }
+      })
+    }
+  })
+}
+
 // 打印Word
 const printToWord = () => {
   // exportFile({ id: noticeInfo.value.id, pdf: false })
@@ -158,6 +401,32 @@
 
 }
 
+const sampleMultiSelect = (e: any) => {
+  sampleSelectedList.value = e
+}
+
+// 弹窗选择复检设备
+const addEditableRow = () => {
+  noticeFormRef.value.validateField('deptId', (valid: boolean, fields: any) => {
+    if (valid === true) {
+      refFilterSample.value.showOrHideFilterDialog(true, noticeInfo.value.deptId, noticeInfo.value.customerName)
+    }
+    else {
+      ElMessage.warning('请先选择委托方')
+    }
+  })
+}
+
+// 删除所选复检设备
+const delSelectRows = () => {
+  if (sampleList.value.length === 0 && sampleList.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+  // 前端界面删除
+  sampleList.value = sampleList.value.filter(item => sampleSelectedList.value.includes(item) === false)
+}
+
 // 点击 发送 按钮
 const sendToCustomer = () => {
   refFilterSysUser.value.showOrHideFilterDialog(true)
@@ -203,6 +472,58 @@
   }
 }
 
+// 弹窗选择复检设备后处理
+const sampleSelectedHandler = (rows: Array<ISampleEquipment>) => {
+  rows.forEach((row) => {
+    const target = sampleList.value.filter(item => item.id === row.id)
+    if (target.length === 0) {
+      sampleList.value.push(row)
+    }
+  })
+}
+
+// 流程操作之后刷新
+const approvalSuccessHandler = (type: string) => {
+  if (type === 'agree' || type === 'refuse') {
+    flowButtsVisable.value = false
+  }
+  else if (type === 'revoke') {
+    cancelButtVisable.value = false
+  }
+}
+
+// 取消
+const noticeRevokeHandler = (param: any) => {
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    cancelButtVisable.value = false
+  })
+}
+
+// 拒绝
+const noticeRefuseHandler = (param: any) => {
+  refuseApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('拒绝审批完成')
+    }
+    else {
+      ElMessage.error(`拒绝审批失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    flowButtsVisable.value = false
+  })
+}
+
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -219,20 +540,39 @@
   }
 }
 
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('reviewNoticeInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+const getEqptMeterIdentifyDict = async () => {
+  // 先从缓存中获取
+  if (sessionStorage.getItem('eqptMeterIdentify') === null || sessionStorage.getItem('eqptMeterIdentify') === undefined) {
+    // 缓存中没有则调用接口查询
+    await getDictByCode('eqptMeterIdentify').then((res) => {
+      if (res.code === 200) {
+        eqptMeterIdentifyDict.value = res.data
+        sessionStorage.setItem('eqptMeterIdentify', JSON.stringify(eqptMeterIdentifyDict.value)) // 放到缓存中
+      }
+    })
+  }
+  else {
+    eqptMeterIdentifyDict.value = JSON.parse(sessionStorage.getItem('eqptMeterIdentify')!)
+  }
 }
 
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
+  status.value = params.status !== undefined ? params.status : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  getSampleEqptList(id.value)
 
   switch (params.type) {
     case 'create' :
       title.value = '检测结果复查通知单（新增）'
+      saveButtVisable.value = true
+      submitButtVisable.value = true
 
       sessionStorage.removeItem('reviewNoticeInfo')
 
@@ -248,12 +588,19 @@
       title.value = '检测结果复查通知单（编辑）'
 
       noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+
+      // 判断显示哪些流程操作按钮
+      showOperationButtonByStatus()
+      keyFieldsDisable.value = true
       break
     case 'detail':
       title.value = '检测结果复查通知单（详情）'
       id.value = params.id
 
       noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+
+      // 查看详情时所有的操作按钮都隐藏
+      showOperationButtonByStatus()
       keyFieldsDisable.value = true
       break
     default:
@@ -265,6 +612,7 @@
 
 const initDict = () => {
   getLabCodeDict()
+  getEqptMeterIdentifyDict()
 }
 
 // 监听 显示中文
@@ -293,7 +641,7 @@
     <el-form ref="noticeFormRef" :model="noticeInfo" :rules="noticeFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
-          <template v-if="type === 'detail'">
+          <template v-if="type === 'detail' && status === '0'">
             <el-button type="primary" @click="sendToCustomer">
               发送给受检单位
             </el-button>
@@ -308,178 +656,157 @@
             </el-button>
           </template>
 
-          <el-button v-else type="primary" @click="saveButtonHandler">
+          <el-button v-if="editButtVisable" type="primary" @click="editClickedHandler()">
+            编辑
+          </el-button>
+
+          <template v-if="flowButtsVisable">
+            <el-button type="primary" @click="approvalAgreeHandler">
+              同意
+            </el-button>
+            <el-button type="danger" @click="approvalRefuseHandler">
+              拒绝
+            </el-button>
+          </template>
+
+          <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
+            提交
+          </el-button>
+          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
+
+          <el-button v-if="deleteButtVisable" type="danger" @click="deleteClickedHandler">
+            删除
+          </el-button>
+          <el-button v-if="cancelButtVisable" type="info" @click="revokeClickedHandler">
+            取消
+          </el-button>
+
           <el-button type="info" @click="resetForm()">
             关闭
           </el-button>
         </template>
 
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="实验室代码" prop="labCode">
-              <el-select v-model="noticeInfo.labCode" placeholder="请选择实验室代码" tabindex="1" :disabled="keyFieldsDisable" style="width: 100%;">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-              <el-input v-model="noticeInfo.labCodeName" type="hidden" />
-            </el-form-item>
-          </el-col>
+        <el-radio-group v-model="currentLabel" style="margin-bottom: 20px;" @change="radioChangeHandler">
+          <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
+        </el-radio-group>
 
-          <el-col :span="6">
-            <el-form-item label="通知单编号">
-              <el-input v-model="noticeInfo.noticeNo" placeholder="通知单编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-          </el-col>
+        <template v-if="current === 'notice-basic'">
+          <el-row :gutter="24">
+            <!-- 第一行 第一列 -->
+            <el-col :span="6">
+              <el-form-item label="实验室代码" prop="labCode">
+                <el-select v-model="noticeInfo.labCode" placeholder="请选择实验室代码" tabindex="1" :disabled="keyFieldsDisable" style="width: 100%;">
+                  <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+                </el-select>
+                <el-input v-model="noticeInfo.labCodeName" type="hidden" />
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="6">
-            <el-form-item label="创建人">
-              <el-input v-model="noticeInfo.noticeName" type="hidden" />
-              <el-input v-model="noticeInfo.createUserId" type="hidden" />
-              <el-input v-model="noticeInfo.createUserName" :disabled="true" />
-            </el-form-item>
-          </el-col>
+            <el-col :span="6">
+              <el-form-item label="文件编号">
+                <el-input v-model="noticeInfo.noticeNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="6">
-            <el-form-item label="创建时间">
-              <el-input v-model="noticeInfo.createTime" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+            <el-col :span="6">
+              <el-form-item label="文件名称">
+                <el-input v-model="noticeInfo.noticeName" :disabled="true" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="委托方" prop="deptId">
+                <el-input v-model="noticeInfo.customerId" type="hidden" />
+                <el-input v-model="noticeInfo.deptId" type="hidden" />
+                <el-input v-model="noticeInfo.customerName" placeholder="请选择委托单位" :disabled="true">
+                  <template #append>
+                    <el-button size="small" :disabled="type === 'detail'" @click="showCustomerFilter">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="要求寄回时间" prop="returnDate">
+                <el-date-picker
+                  v-model="noticeInfo.returnDate" type="date"
+                  format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                  placeholder="请选择寄回时间" :clearable="true" :disabled="type === 'detail'"
+                  style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="创建人">
+                <el-input v-model="noticeInfo.noticeName" type="hidden" />
+                <el-input v-model="noticeInfo.createUserId" type="hidden" />
+                <el-input v-model="noticeInfo.createUserName" :disabled="true" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <el-input v-model="noticeInfo.createTime" :disabled="true" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </template>
       </detail-page>
-    </el-form>
 
-    <el-form ref="noticeRef" :model="noticeInfo" :rules="noticeRules" style="display: flex; white-space: nowrap; flex-wrap: wrap;">
-      <el-input v-model="noticeInfo.labCode" type="hidden" />
-      <el-input v-model="noticeInfo.labCodeName" type="hidden" />
-      <el-input v-model="noticeInfo.noticeNo" type="hidden" />
-      <el-input v-model="noticeInfo.noticeName" type="hidden" />
-      <el-input v-model="noticeInfo.createUserId" type="hidden" />
-      <el-input v-model="noticeInfo.createUserName" type="hidden" />
-      <el-input v-model="noticeInfo.createTime" type="hidden" />
-      <detail-block style="margin-top: 20px; width: 100%; font-size: 1.5rem;" title="">
-        <el-row :gutter="24">
-          <el-col :span="24">
-            <div class="notice-title">
-              检测结果复查通知单
-            </div>
-          </el-col>
-        </el-row>
+      <template v-if="current === 'notice-basic'">
+        <table-container title="复查设备清单">
+          <template v-if="type !== 'detail'" #btns-right>
+            <el-button type="primary" @click="addEditableRow()">
+              增加行
+            </el-button>
+            <el-button type="info" @click="delSelectRows()">
+              删除行
+            </el-button>
+          </template>
 
-        <el-row :gutter="24" style="padding: 0 6rem;">
-          <el-form-item label="" prop="deptId">
-            <el-input v-model="noticeInfo.customerId" type="hidden" />
-            <el-input v-model="noticeInfo.deptId" type="hidden" />
-            <el-input v-model="noticeInfo.customerName" placeholder="请选择委托单位" size="large" :disabled="true" style="width: 300px;">
-              <template #append>
-                <el-button size="small" :disabled="type === 'detail'" @click="showCustomerFilter">
-                  选择
-                </el-button>
+          <el-table :data="sampleList" border style="width: 100%;" @selection-change="sampleMultiSelect">
+            <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
+            <el-table-column align="center" label="序号" width="60" type="index" />
+            <el-table-column
+              v-for="item in samplesColumns"
+              :key="item.value"
+              :prop="item.value"
+              :label="item.text"
+              :width="item.width"
+              align="center"
+            >
+              <template #default="scope">
+                <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+                <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
               </template>
-            </el-input>
-          </el-form-item>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 30px; padding: 0 8rem;">
-          <span class="notice-text">由于我站工作失误，贵单位于</span>
-
-          <el-form-item label="" prop="submitDate">
-            <el-date-picker
-              v-model="noticeInfo.submitDate" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择送检时间" :clearable="true" :disabled="type === 'detail'"
-              size="large"
-              style="width: 300px; margin: 0 10px;"
-            />
-          </el-form-item>
-
-          <span class="notice-text">送来的</span>
-
-          <el-form-item label="" prop="deviceName">
-            <el-input
-              v-model="noticeInfo.deviceName" placeholder="设备名称"
-              :clearable="true" :disabled="type === 'detail'"
-              size="large" style="width: 300px; margin: 0 10px;"
-            />
-          </el-form-item>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;padding: 0 6rem;">
-          <el-form-item label="" prop="deviceModel">
-            <el-input
-              v-model="noticeInfo.deviceModel" placeholder="设备型号"
-              :clearable="true" :disabled="type === 'detail'"
-              size="large" style="width: 300px;"
-            />
-          </el-form-item>
-
-          <el-form-item label="" prop="deviceNo">
-            <el-input
-              v-model="noticeInfo.deviceNo" placeholder="设备编号"
-              :clearable="true" :disabled="type === 'detail'"
-              size="large" style="width: 300px; margin: 0 10px;"
-            />
-          </el-form-item>
-
-          <span class="notice-text">测量结果可能有误，需重新进行测试、校准或检定。</span>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;padding: 0 6rem;">
-          <span class="notice-text">请贵单位于</span>
-
-          <el-form-item label="" prop="returnDate">
-            <el-date-picker
-              v-model="noticeInfo.returnDate" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择寄回时间" :clearable="true" :disabled="type === 'detail'"
-              style="width: 300px; margin: 0 10px;" size="large"
-            />
-          </el-form-item>
-
-          <span class="notice-text">前将此设备以及证书或报告一同送（寄）回本站，谢谢合作。</span>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 50px;">
-          <el-col :span="6" :offset="10">
-            <span class="notice-text"> 特此通知 </span>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 50px;">
-          <el-col :span="6" :offset="12">
-            <span class="notice-text">中国西昌卫星发射中心计量测试站</span>
-
-            <el-form-item label="" prop="noticeDate">
-              <el-date-picker
-                v-model="noticeInfo.noticeDate" type="date"
-                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="请选择通知日期" :clearable="true" :disabled="type === 'detail'"
-                style="width: 300px; margin-top: 20px;" size="large"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </detail-block>
+            </el-table-column>
+          </el-table>
+        </table-container>
+      </template>
     </el-form>
 
+    <approval-dialog
+      ref="apprDial"
+      @on-success="approvalSuccessHandler"
+      @on-refuse="noticeRefuseHandler"
+      @on-revoke="noticeRevokeHandler"
+    />
+
+    <template v-if="current === 'notice-approval' && status !== '1'">
+      <approval-record-table :process-id="noticeInfo.processId" />
+    </template>
+
     <filter-sys-user ref="refFilterSysUser" @record-selected="sysUserSelectedHandler" />
 
     <filter-customer ref="refFilterCustomer" @record-selected="customerSelectedHandler" />
+
+    <filter-sample ref="refFilterSample" @records-selected="sampleSelectedHandler" />
   </app-container>
 </template>
-
-<style scoped>
-.notice-title {
-  text-align: center;
-  font-weight: bold;
-  font-size: 2rem;
-  font-family: SimSun, STSong;
-  margin-bottom: 50px;
-}
-
-.notice-text {
-  font-family: SimSun, STSong;
-  line-height: 40px;
-}
-</style>

diff --git a/src/api/resource/reviewNotice.ts b/src/api/resource/reviewNotice.ts
index 68499f9..1760871 100644
--- a/src/api/resource/reviewNotice.ts
+++ b/src/api/resource/reviewNotice.ts
@@ -3,16 +3,61 @@
 
 export function getReviewNoticeList(data: any) {
   return request({
-    url: `${prefix}/reviewNotice/listPage?limit=${data.limit}&offset=${data.offset}`,
+    url: `${prefix}/reviewNotice/approval/listPage?limit=${data.limit}&offset=${data.offset}`,
     method: 'post',
     data,
   })
 }
 
-// 保存
+// 筛选复查设备列表
+export function getSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 详情页复查设备清单
+export function detailSampleEqptList(data: any) {
+  return request({
+    url: `${prefix}/reviewNotice/review/sample/listPage?limit=${data.limit}&offset=${data.offset}`,
+    method: 'post',
+    data,
+  })
+}
+
+// 保存 草稿箱
 export function saveReviewNotice(data: object) {
   return request({
-    url: `${prefix}/reviewNotice/add`,
+    url: `${prefix}/reviewNotice/save`,
+    method: 'post',
+    data,
+  })
+}
+
+// 编辑草稿箱 不走审批流程
+export function updateDraftNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/draftUpdate`,
+    method: 'post',
+    data,
+  })
+}
+
+// 提交
+export function sumbitNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/submit`,
+    method: 'post',
+    data,
+  })
+}
+
+// 未通过/撤回后/取消后提交
+export function failUpdateNotice(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/failUpdate`,
     method: 'post',
     data,
   })
@@ -27,7 +72,7 @@
   })
 }
 
-// 删除
+// 删除 - 草稿箱
 export function deleteReviewNotice(data: object) {
   return request({
     url: `${prefix}/reviewNotice/delete`,
@@ -36,6 +81,15 @@
   })
 }
 
+// 删除 - 已取消
+export function deleteReviewNoticeRevoked(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/delete`,
+    method: 'post',
+    data,
+  })
+}
+
 export function exportFile(data: object) {
   return request({
     url: `${prefix}/reviewNotice/exportFile`,
@@ -43,3 +97,21 @@
     data,
   })
 }
+
+// 发起者撤回，表单状态更改为已取消
+export function revokeApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/revoke`,
+    method: 'post',
+    data,
+  })
+}
+
+// 委托方名录审批-拒绝
+export function refuseApproval(data: object) {
+  return request({
+    url: `${prefix}/reviewNotice/approval/refuse`,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts
index af59c20..dbf39ec 100644
--- a/src/utils/scheduleDict.ts
+++ b/src/utils/scheduleDict.ts
@@ -27,6 +27,7 @@
   CUSTOMER_OPINION_REGISTER_APPROVAL = 'zyglwtfyjdjb', // 委托方意见登记表
   CONTRACT_REVIEW_APPROVAL = 'zyglyqwtsjhtpsb', // 要求、委托书及合同评审表
   SEAL_USE_REGISTER_APPROVAL = 'zyglyzsydj', // 印章使用登记
+  REVIEW_NOTICE_APPROVAL = 'zygljcjgfctzd', // 检测结果复查通知单审批流程
 
   // 质量活动
   QUALITY_SUPERVISION_RECORD_APPROVAL = 'zlhdzlbgspgl', // 质量监督报告
diff --git a/src/views/resource/common/filterSample.vue b/src/views/resource/common/filterSample.vue
new file mode 100644
index 0000000..48d8bcc
--- /dev/null
+++ b/src/views/resource/common/filterSample.vue
@@ -0,0 +1,217 @@
+<!-- 筛选样品弹窗 -->
+<script name="FilterSample" lang="ts" setup>
+import { ElMessage, dayjs } from 'element-plus'
+import type { DateModelType } from 'element-plus'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
+import type { IDictType } from '@/commonInterface/resource-interface'
+import type { ISampleEquipment, ISampleEquipmentQuery } from '@/views/resource/customer/reviewNotice/customer-notice'
+import { getDictByCode } from '@/api/system/dict'
+import { getSampleEqptList } from '@/api/resource/reviewNotice'
+import { findDictNameByCode } from '@/commonMethods/useDictCheck'
+
+const emit = defineEmits(['recordsSelected'])
+
+const showFilterDialog = ref(false)
+const listQuery = ref<ISampleEquipmentQuery>({
+  customerId: '',
+  equipmentNo: '',
+  equipmentName: '',
+  certificateValidStart: '',
+  certificateValidEnd: '',
+  equipmentType: '',
+  limit: 10,
+  offset: 1,
+})
+const dateRange = ref<[DateModelType, DateModelType]>(['', ''])// 筛选时间段数据
+const customerName = ref<string>('')
+const total = ref<number>(0) // 数据总条数
+const columns = ref <Array<TableColumn>>([
+  { text: '设备统一编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '所在单位', value: 'companyName', align: 'center', width: '160' },
+  { text: '负责人', value: 'directorName', align: 'center', width: '160' },
+  { text: '最近送检时间', value: 'checkDateStr', align: 'center', width: '120' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', width: '100' },
+  { text: '证书有效日期', value: 'certificateValidStr', align: 'center', width: '120' },
+  { text: '检验员', value: 'measurePersonName', align: 'center', width: '120' },
+]) // 表头
+
+const equipmentList = ref<Array<ISampleEquipment>>([])
+
+const rowSelected = ref([])
+
+const eqptCategoryDict = ref<IDictType[]>([])
+const eqptMeterIdentifyDict = ref<IDictType[]>([])
+
+// 逻辑
+// 查询设备列表
+const getList = () => {
+  getSampleEqptList(listQuery.value).then((res) => {
+    if (res.code === 200) {
+      equipmentList.value = res.data.rows.map((item: ISampleEquipment) => {
+        return {
+          ...item,
+          checkDateStr: dayjs(item.checkDate).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.checkDate).format('YYYY-MM-DD'),
+          certificateValidStr: dayjs(item.certificateValid).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.certificateValid).format('YYYY-MM-DD'),
+          meterIdentifyName: findDictNameByCode(item.meterIdentify, eqptMeterIdentifyDict.value),
+        }
+      })
+      total.value = res.data.total
+    }
+    else {
+      equipmentList.value = []
+    }
+  })
+}
+
+const getEqptDeviceCategoryDict = async () => {
+  // 先从缓存中获取
+  if (sessionStorage.getItem('eqptDeviceCategory') === null || sessionStorage.getItem('eqptDeviceCategory') === undefined) {
+    // 缓存中没有则调用接口查询
+    await getDictByCode('eqptDeviceCategory').then((res) => {
+      if (res.code === 200) {
+        eqptCategoryDict.value = res.data
+        sessionStorage.setItem('eqptDeviceCategory', JSON.stringify(eqptCategoryDict.value)) // 放到缓存中
+      }
+    })
+  }
+  else {
+    eqptCategoryDict.value = JSON.parse(sessionStorage.getItem('eqptDeviceCategory')!)
+  }
+}
+
+const getEqptMeterIdentifyDict = async () => {
+  // 先从缓存中获取
+  if (sessionStorage.getItem('eqptMeterIdentify') === null || sessionStorage.getItem('eqptMeterIdentify') === undefined) {
+    // 缓存中没有则调用接口查询
+    await getDictByCode('eqptMeterIdentify').then((res) => {
+      if (res.code === 200) {
+        eqptMeterIdentifyDict.value = res.data
+        sessionStorage.setItem('eqptMeterIdentify', JSON.stringify(eqptMeterIdentifyDict.value)) // 放到缓存中
+      }
+    })
+  }
+  else {
+    eqptMeterIdentifyDict.value = JSON.parse(sessionStorage.getItem('eqptMeterIdentify')!)
+  }
+}
+
+const showOrHideFilterDialog = (show: boolean, customerDeptId = '', name = '') => {
+  if (show === false) {
+    listQuery.value.equipmentName = ''
+    listQuery.value.customerId = ''
+    listQuery.value.equipmentNo = ''
+    listQuery.value.equipmentType = ''
+    listQuery.value.limit = 10
+    listQuery.value.offset = 1
+
+    customerName.value = ''
+  }
+  else {
+    getEqptDeviceCategoryDict()
+    getEqptMeterIdentifyDict()
+    listQuery.value.customerId = customerDeptId
+    customerName.value = name
+
+    getList()
+  }
+
+  showFilterDialog.value = show
+}
+
+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
+  }
+  getList()
+}
+
+const eqptSelected = (e: any) => {
+  rowSelected.value = e
+}
+
+const submitEquipmentSelected = () => {
+  if (rowSelected.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+
+  emit('recordsSelected', rowSelected.value)
+  showOrHideFilterDialog(false)
+}
+
+watch(dateRange, (val) => {
+  if (val) {
+    listQuery.value.certificateValidStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
+    listQuery.value.certificateValidEnd = dayjs(val[1]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[1]).format('YYYY-MM-DD')
+  }
+  else {
+    listQuery.value.certificateValidStart = ''
+    listQuery.value.certificateValidEnd = ''
+  }
+})
+
+defineExpose({
+  showOrHideFilterDialog,
+})
+</script>
+
+<template>
+  <el-dialog v-model="showFilterDialog" title="选择设备" :append-to-body="true" :close-on-click-modal="false" top="10vh" width="85%">
+    <search-area :need-clear="false" @search="getList">
+      <search-item>
+        <el-input v-model="listQuery.customerId" type="hidden" />
+        <el-input v-model="customerName" :disabled="true" />
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.equipmentType" placeholder="设备类型" clearable>
+          <el-option v-for="dict in eqptCategoryDict" :key="dict.id" :value="dict.value" :label="dict.name" />
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentName" placeholder="设备名称" clearable />
+      </search-item>
+      <search-item>
+        <el-input v-model="listQuery.equipmentNo" placeholder="设备编号" clearable />
+      </search-item>
+      <search-item>
+        <el-date-picker v-model="dateRange" type="daterange" start-placeholder="证书有效期（开始）" end-placeholder="证书有效期（结束）" />
+      </search-item>
+    </search-area>
+
+    <!-- 表格数据展示 -->
+    <table-container :title-show="false">
+      <!-- 表格区域 -->
+      <normal-table
+        :data="equipmentList" :total="total" :columns="columns"
+        :query="{ limit: listQuery.limit, offset: listQuery.offset }"
+        :is-showmulti-select="true"
+        @change="changePage"
+        @multi-select="eqptSelected"
+      >
+        <template #preColumns>
+          <el-table-column label="序号" width="55" align="center">
+            <template #default="scope">
+              {{ (listQuery.offset - 1) * listQuery.limit + scope.$index + 1 }}
+            </template>
+          </el-table-column>
+        </template>
+      </normal-table>
+    </table-container>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="showOrHideFilterDialog(false)">取消</el-button>
+        <el-button type="primary" @click="submitEquipmentSelected">
+          确定
+        </el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
diff --git a/src/views/resource/customer/reviewNotice/customer-notice.ts b/src/views/resource/customer/reviewNotice/customer-notice.ts
index c92cbe4..a31f926 100644
--- a/src/views/resource/customer/reviewNotice/customer-notice.ts
+++ b/src/views/resource/customer/reviewNotice/customer-notice.ts
@@ -3,12 +3,48 @@
   createUserName: string
   createTimeStart: string
   createTimeEnd: string
+  sendStatus: string
+  formId: string
+  approvalStatus: string
   offset: number
   limit: number
   sort?: string
   order?: string
 }
 
+export interface ISampleEquipmentQuery {
+  customerId: string
+  equipmentName: string
+  certificateValidStart: string
+  certificateValidEnd: string
+  equipmentNo: string
+  equipmentType: string
+  offset: number
+  limit: number
+}
+
+export interface ISampleEquipment {
+  id: string
+  equipmentId: string
+  equipmentNo: string
+  equipmentName: string
+  category: string
+  model: string
+  manufactureNo: string
+  manufacturer: string
+  companyId: string
+  companyName: string
+  directorId: string
+  directorName: string
+  checkDate: string
+  checkCycle: string
+  checkOrganization: string
+  checkDestination: string
+  meterIdentify: string
+  measurePersonName: string
+  certificateValid: string
+}
+
 export interface ICustomerNoticeInfo {
   id?: string
   customerId: string
@@ -26,6 +62,16 @@
   deviceNo?: string
   returnDate?: string
   noticeDate?: string
+  sampleIdList: Array<string>
+  sendStatus: string
+  sendStatusValue?: string
+  approvalStatus?: string
+  approvalStatusName?: string
+  appealUserId: string
+  appealUserName: string
+  processId: string
+  taskId: string
+  decisionItem?: string
   createUserId?: string
   createUserName?: string
   createTime?: string
diff --git a/src/views/resource/customer/reviewNotice/detail.vue b/src/views/resource/customer/reviewNotice/detail.vue
index 930d9c6..227e2fa 100644
--- a/src/views/resource/customer/reviewNotice/detail.vue
+++ b/src/views/resource/customer/reviewNotice/detail.vue
@@ -1,30 +1,49 @@
 <!-- 授权代理委托书详情 -->
 <script name="ReviewNoticeDetail" lang="ts" setup>
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
-import type{ ICustomerNoticeInfo } from './customer-notice'
+import type { ICustomerNoticeInfo, ISampleEquipment } from './customer-notice'
+import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+import ApprovalRecordTable from '@/components/ApprovalRecord/ApprovalRecordTable.vue'
 import useUserStore from '@/store/modules/user'
-import { exportFile, saveReviewNotice, updateReviewNotice } from '@/api/resource/reviewNotice'
+import { deleteReviewNotice, deleteReviewNoticeRevoked, detailSampleEqptList, exportFile, failUpdateNotice, refuseApproval, revokeApproval, saveReviewNotice, sumbitNotice, updateDraftNotice, updateReviewNotice } from '@/api/resource/reviewNotice'
+import type { TableColumn } from '@/components/NormalTable/table_interface'
 import type { IDictType } from '@/commonInterface/resource-interface'
+import { SCHEDULE } from '@/utils/scheduleDict'
 import { getDictByCode } from '@/api/system/dict'
+import { findDictNameByCode } from '@/commonMethods/useDictCheck'
 import FilterSysUser from '@/views/resource/common/filterSysUser.vue'
 import FilterCustomer from '@/views/resource/common/filterCustomer.vue'
+import FilterSample from '@/views/resource/common/filterSample.vue'
 
 // 从路由中传过来的参数
 const type = ref<string>('')
 const id = ref<string>('')
+const status = ref<string>('')
+
+// 关键字段是否可以编辑
+const keyFieldsDisable = ref<boolean>(true)
 
 const userInfo = useUserStore()
 const route = useRoute()
 const router = useRouter()
 const title = ref('')
 
-// 关键字段是否可以编辑
-const keyFieldsDisable = ref<boolean>(true)
+const radioItems = ref([
+  { name: '基本信息', value: 'notice-basic' },
+  { name: '审批详情', value: 'notice-approval' },
+])
 
+const current = ref('')
+const currentLabel = ref('')
+
+const flowFormId = SCHEDULE.REVIEW_NOTICE_APPROVAL // 资源管理 - 要求、委托书及合同评审表
+
+// 弹窗子组件
+const apprDial = ref()
 const noticeFormRef = ref()
-const noticeRef = ref()
 const refFilterSysUser = ref()
 const refFilterCustomer = ref()
+const refFilterSample = ref()
 
 const noticeInfo = ref<ICustomerNoticeInfo>({
   id: '',
@@ -43,6 +62,14 @@
   deviceNo: '',
   returnDate: '',
   noticeDate: '',
+  sampleIdList: [],
+  sendStatus: '',
+  approvalStatus: '',
+  approvalStatusName: '',
+  appealUserId: '',
+  appealUserName: '',
+  processId: '',
+  taskId: '',
   createUserId: '',
   createUserName: '',
   createTime: '',
@@ -50,22 +77,125 @@
 
 const noticeFormRules = ref({
   labCode: [{ required: true, message: '实验室代码不能为空，请选择', trigger: ['change', 'blur'] }],
+  deptId: [{ required: true, message: '委托单位不能为空，请选择', trigger: ['change', 'blur'] }],
+  returnDate: [{ required: true, message: '寄回日期不能为空', trigger: 'blur' }],
 }) // 表单验证规则
 
-const noticeRules = ref({
-  deptId: [{ required: true, message: '委托单位不能为空，请选择', trigger: ['change', 'blur'] }],
-  submitDate: [{ required: true, message: '送检日期不能为空，请选择', trigger: 'blur' }],
-  deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
-  deviceNo: [{ required: true, message: '设备编号不能为空', trigger: 'blur' }],
-  deviceModel: [{ required: true, message: '设备型号不能为空', trigger: 'blur' }],
-  returnDate: [{ required: true, message: '寄回日期不能为空', trigger: 'blur' }],
-  noticeDate: [{ required: true, message: '通知日期不能为空，请选择', trigger: 'blur' }],
-}) // 表单验证规则
+// 是否显示相关按钮
+const saveButtVisable = ref<boolean>(false) // 是否显示 保存 按钮
+const submitButtVisable = ref<boolean>(false) // 是否显示 提交 按钮
+const flowButtsVisable = ref<boolean>(false) // 是否显示 同意和拒绝 按钮
+const cancelButtVisable = ref<boolean>(false) // 是否显示 取消 按钮
+const deleteButtVisable = ref<boolean>(false) // 是否显示 删除 按钮
+const editButtVisable = ref<boolean>(false) // 是否显示 编辑 按钮
 
 // 字典值
 const labCodeDict = ref<IDictType[]>([])
+const eqptMeterIdentifyDict = ref<IDictType[]>([])
+
+const sampleList = ref<ISampleEquipment[]>([])
+const samplesColumns = ref<TableColumn[]>([
+  { text: '设备统一编号', value: 'equipmentNo', align: 'center', width: '160' },
+  { text: '设备名称', value: 'equipmentName', align: 'center' },
+  { text: '型号规格', value: 'model', align: 'center' },
+  { text: '出厂编号', value: 'manufactureNo', align: 'center' },
+  { text: '生产厂家', value: 'manufacturer', align: 'center' },
+  { text: '所在单位', value: 'companyName', align: 'center', width: '160' },
+  { text: '负责人', value: 'directorName', align: 'center', width: '160' },
+  { text: '最近送检时间', value: 'checkDateStr', align: 'center', width: '120' },
+  { text: '计量标识', value: 'meterIdentifyName', align: 'center', width: '100' },
+  { text: '证书有效日期', value: 'certificateValidStr', align: 'center', width: '120' },
+  { text: '检验员', value: 'measurePersonName', align: 'center', width: '120' },
+])
+
+const sampleSelectedList = ref<ISampleEquipment[]>([])
 
 // 逻辑
+// 详情页的各个tab切换操作
+const radioChangeHandler = (newVal: string | number | boolean) => {
+  const radioTarget = radioItems.value.filter(item => item.name === newVal)
+  if (radioTarget.length > 0) {
+    currentLabel.value = radioTarget[0].name
+    current.value = radioTarget[0].value
+  }
+  else {
+    currentLabel.value = radioItems.value[0].name
+    current.value = radioItems.value[0].value
+  }
+}
+
+// 将所有流程操作的按钮隐藏
+const hideAllOpterationButtons = () => {
+  saveButtVisable.value = false
+  submitButtVisable.value = false
+  flowButtsVisable.value = false
+  cancelButtVisable.value = false
+  deleteButtVisable.value = false
+  editButtVisable.value = false
+}
+
+// 根据审批状态显示对应的流程操作按钮
+const showOperationButtonByStatus = () => {
+  switch (status.value) {
+    case '1':
+      // 草稿箱：保存、提交按钮可见
+      saveButtVisable.value = true
+      submitButtVisable.value = true
+      break
+
+    case '2':
+      // 待审批：同意、拒绝按钮可见
+      flowButtsVisable.value = true
+      break
+
+    case '3':
+      // 审批中：取消按钮可见
+      cancelButtVisable.value = true
+      break
+
+    case '5':
+      // 未通过：编辑 按钮可见
+      editButtVisable.value = true
+      break
+
+    case '6':
+      // 已取消：编辑 删除按钮可见
+      editButtVisable.value = true
+      deleteButtVisable.value = true
+      break
+
+    default:
+      // 默认不显示所有的操作按钮
+      hideAllOpterationButtons()
+      break
+  }
+}
+
+// 关闭
+const resetForm = () => {
+  sessionStorage.removeItem('reviewNoticeInfo') // 返回列表时 将缓存中的数据删除
+  router.go(-1)
+}
+
+// 查询复查设备清单详情
+const getSampleEqptList = (noticeId: string) => {
+  if (noticeId === '' || noticeId === undefined) {
+    return
+  }
+
+  detailSampleEqptList({ id: noticeId, limit: 1000, offset: 1 }).then((res) => {
+    if (res.code === 200) {
+      sampleList.value = res.data.rows.map((item: ISampleEquipment) => {
+        return {
+          ...item,
+          checkDateStr: dayjs(item.checkDate).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.checkDate).format('YYYY-MM-DD'),
+          certificateValidStr: dayjs(item.certificateValid).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(item.certificateValid).format('YYYY-MM-DD'),
+          meterIdentifyName: findDictNameByCode(item.meterIdentify, eqptMeterIdentifyDict.value),
+        }
+      })
+    }
+  })
+}
 
 // 保存至草稿箱
 const saveNoticeInfo = () => {
@@ -79,7 +209,8 @@
       noticeInfo.value.id = res.data.id
       id.value = res.data.id
 
-      type.value = 'detail'
+      type.value = 'update'
+      status.value = '1' // 保存成功后进入草稿箱 为了不显示审批详情
     }
     else {
       // 提示失败信息
@@ -88,9 +219,9 @@
   })
 }
 
-// 编辑
+// 编辑草稿箱（不走流程审批）
 const updateNoticeInfo = () => {
-  updateReviewNotice(noticeInfo.value).then((res) => {
+  updateDraftNotice(noticeInfo.value).then((res) => {
     if (res.code === 200) {
       // 提示保存成功
       ElMessage.success('保存成功')
@@ -102,26 +233,29 @@
   })
 }
 
+// 编辑按钮点击事件处理函数
+const editClickedHandler = () => {
+  type.value = 'update'
+  title.value = '检测结果复查通知单（编辑）'
+
+  // 隐藏编辑按钮 显示提交按钮
+  editButtVisable.value = false
+  submitButtVisable.value = true
+}
+
 // 新建时保存后的处理 获取返回的id
 const saveButtonHandler = async () => {
-  if (!noticeRef) { return }
+  if (sampleList.value.length === 0) {
+    ElMessage.warning('复检设备不能为空，请重新选择')
+    return
+  }
 
-  let formValid
-
-  // 先对表单一进行校验
-  await noticeFormRef.value.validate((valid: boolean) => {
-    if (valid === false) {
-      formValid = false
-    }
-    else {
-      formValid = true
-    }
+  noticeInfo.value.sampleIdList = sampleList.value.map((item) => {
+    return item.id
   })
 
-  if (formValid === false) { return }
-
-  // 表单一通过校验后 对表单二进行校验
-  await noticeRef.value.validate((valid: boolean, fields: any) => {
+  // 对表单进行校验
+  await noticeFormRef.value.validate((valid: boolean, fields: any) => {
     if (valid === true) {
       ElMessageBox.confirm(
         '确认保存吗？',
@@ -143,6 +277,115 @@
   })
 }
 
+// 提交按钮
+const submitButtonHandler = async () => {
+  if (noticeInfo.value === null || noticeInfo.value.processId === undefined || noticeInfo.value.processId === '') {
+    // 流程id为空 表示还未进入流程中 直接提交
+    ElMessageBox.confirm(`是否提交通知单 ${noticeInfo.value.noticeNo}`, '提示', {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    }).then(() => {
+      sumbitNotice({
+        formId: flowFormId,
+        id: noticeInfo.value.id,
+      }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success(`通知单 ${noticeInfo.value.noticeNo} 提交成功`)
+
+          type.value = 'detail'
+          hideAllOpterationButtons()
+        }
+        else {
+          ElMessage.error(`通知单 ${noticeInfo.value.noticeNo} 提交失败：${res.message}`)
+        }
+      })
+    })
+  }
+  else {
+    // 之前已经在流程中的表单 保存提交
+    if (sampleList.value.length === 0) {
+      ElMessage.warning('复检设备不能为空，请重新选择')
+      return
+    }
+
+    noticeInfo.value.sampleIdList = sampleList.value.map((item) => {
+      return item.id
+    })
+
+    await noticeFormRef.value.validate((valid: boolean) => {
+      if (valid === true) {
+        failUpdateNotice(noticeInfo.value).then((res) => {
+          if (res.code === 200) {
+          // 提示保存成功
+            ElMessage.success(`通知单 ${noticeInfo.value.noticeNo} 提交成功`)
+
+            type.value = 'detail'
+            hideAllOpterationButtons()
+          }
+          else {
+          // 提示失败信息
+            ElMessage.error(`通知单 ${noticeInfo.value.noticeNo} 提交失败：${res.message}`)
+          }
+        })
+      }
+    })
+  }
+}
+
+// 流程审批-同意
+const approvalAgreeHandler = () => {
+  apprDial.value.initDialog('agree', noticeInfo.value.id, noticeInfo.value.taskId, '')
+}
+
+// 流程审批-拒绝
+const approvalRefuseHandler = () => {
+  apprDial.value.initDialog('refuse', noticeInfo.value.id, noticeInfo.value.taskId, '')
+}
+
+// 取消（撤回审批单）
+const revokeClickedHandler = () => {
+  apprDial.value.initDialog('revoke', noticeInfo.value.id, noticeInfo.value.taskId, noticeInfo.value.processId)
+}
+
+// 删除（只有已取消的可以在详情中删除）
+const deleteClickedHandler = () => {
+  ElMessageBox.confirm(
+    `确认删除通知单 ${noticeInfo.value.noticeNo} 吗？`,
+    '提示',
+    {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    },
+  ).then(() => {
+    if (status.value === '0') {
+      // 草稿箱删除
+      deleteReviewNotice({ id: noticeInfo.value.id }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success(`通知单 ${noticeInfo.value.noticeNo} 删除成功`)
+          resetForm()
+        }
+        else {
+          ElMessage.error(`通知单 ${noticeInfo.value.noticeNo} 删除失败：${res.message}`)
+        }
+      })
+    }
+    else if (status.value === '6') {
+      // 已取消删除
+      deleteReviewNoticeRevoked({ id: noticeInfo.value.id, taskId: noticeInfo.value.taskId }).then((res) => {
+        if (res.code === 200) {
+          ElMessage.success(`通知单 ${noticeInfo.value.noticeNo} 删除成功`)
+          resetForm()
+        }
+        else {
+          ElMessage.error(`通知单 ${noticeInfo.value.noticeNo} 删除失败：${res.message}`)
+        }
+      })
+    }
+  })
+}
+
 // 打印Word
 const printToWord = () => {
   // exportFile({ id: noticeInfo.value.id, pdf: false })
@@ -158,6 +401,32 @@
 
 }
 
+const sampleMultiSelect = (e: any) => {
+  sampleSelectedList.value = e
+}
+
+// 弹窗选择复检设备
+const addEditableRow = () => {
+  noticeFormRef.value.validateField('deptId', (valid: boolean, fields: any) => {
+    if (valid === true) {
+      refFilterSample.value.showOrHideFilterDialog(true, noticeInfo.value.deptId, noticeInfo.value.customerName)
+    }
+    else {
+      ElMessage.warning('请先选择委托方')
+    }
+  })
+}
+
+// 删除所选复检设备
+const delSelectRows = () => {
+  if (sampleList.value.length === 0 && sampleList.value.length === 0) {
+    ElMessage.warning('请至少选择一行')
+    return
+  }
+  // 前端界面删除
+  sampleList.value = sampleList.value.filter(item => sampleSelectedList.value.includes(item) === false)
+}
+
 // 点击 发送 按钮
 const sendToCustomer = () => {
   refFilterSysUser.value.showOrHideFilterDialog(true)
@@ -203,6 +472,58 @@
   }
 }
 
+// 弹窗选择复检设备后处理
+const sampleSelectedHandler = (rows: Array<ISampleEquipment>) => {
+  rows.forEach((row) => {
+    const target = sampleList.value.filter(item => item.id === row.id)
+    if (target.length === 0) {
+      sampleList.value.push(row)
+    }
+  })
+}
+
+// 流程操作之后刷新
+const approvalSuccessHandler = (type: string) => {
+  if (type === 'agree' || type === 'refuse') {
+    flowButtsVisable.value = false
+  }
+  else if (type === 'revoke') {
+    cancelButtVisable.value = false
+  }
+}
+
+// 取消
+const noticeRevokeHandler = (param: any) => {
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    cancelButtVisable.value = false
+  })
+}
+
+// 拒绝
+const noticeRefuseHandler = (param: any) => {
+  refuseApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('拒绝审批完成')
+    }
+    else {
+      ElMessage.error(`拒绝审批失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    flowButtsVisable.value = false
+  })
+}
+
 const getLabCodeDict = async () => {
   // 先从缓存中获取
   if (sessionStorage.getItem('bizLabCode') === null || sessionStorage.getItem('bizLabCode') === undefined) {
@@ -219,20 +540,39 @@
   }
 }
 
-// 关闭
-const resetForm = () => {
-  sessionStorage.removeItem('reviewNoticeInfo') // 返回列表时 将缓存中的数据删除
-  router.go(-1)
+const getEqptMeterIdentifyDict = async () => {
+  // 先从缓存中获取
+  if (sessionStorage.getItem('eqptMeterIdentify') === null || sessionStorage.getItem('eqptMeterIdentify') === undefined) {
+    // 缓存中没有则调用接口查询
+    await getDictByCode('eqptMeterIdentify').then((res) => {
+      if (res.code === 200) {
+        eqptMeterIdentifyDict.value = res.data
+        sessionStorage.setItem('eqptMeterIdentify', JSON.stringify(eqptMeterIdentifyDict.value)) // 放到缓存中
+      }
+    })
+  }
+  else {
+    eqptMeterIdentifyDict.value = JSON.parse(sessionStorage.getItem('eqptMeterIdentify')!)
+  }
 }
 
 const initDialog = (params: any) => {
   // 从路由中获取参数
   type.value = params.type
   id.value = params.id !== undefined ? params.id : ''
+  status.value = params.status !== undefined ? params.status : ''
+
+  // 默认显示第一个tab内容
+  current.value = radioItems.value[0].value
+  currentLabel.value = radioItems.value[0].name
+
+  getSampleEqptList(id.value)
 
   switch (params.type) {
     case 'create' :
       title.value = '检测结果复查通知单（新增）'
+      saveButtVisable.value = true
+      submitButtVisable.value = true
 
       sessionStorage.removeItem('reviewNoticeInfo')
 
@@ -248,12 +588,19 @@
       title.value = '检测结果复查通知单（编辑）'
 
       noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+
+      // 判断显示哪些流程操作按钮
+      showOperationButtonByStatus()
+      keyFieldsDisable.value = true
       break
     case 'detail':
       title.value = '检测结果复查通知单（详情）'
       id.value = params.id
 
       noticeInfo.value = JSON.parse(sessionStorage.getItem('reviewNoticeInfo')!)
+
+      // 查看详情时所有的操作按钮都隐藏
+      showOperationButtonByStatus()
       keyFieldsDisable.value = true
       break
     default:
@@ -265,6 +612,7 @@
 
 const initDict = () => {
   getLabCodeDict()
+  getEqptMeterIdentifyDict()
 }
 
 // 监听 显示中文
@@ -293,7 +641,7 @@
     <el-form ref="noticeFormRef" :model="noticeInfo" :rules="noticeFormRules" label-position="right" label-width="110px" border stripe>
       <detail-page :title="`${title}`">
         <template #btns>
-          <template v-if="type === 'detail'">
+          <template v-if="type === 'detail' && status === '0'">
             <el-button type="primary" @click="sendToCustomer">
               发送给受检单位
             </el-button>
@@ -308,178 +656,157 @@
             </el-button>
           </template>
 
-          <el-button v-else type="primary" @click="saveButtonHandler">
+          <el-button v-if="editButtVisable" type="primary" @click="editClickedHandler()">
+            编辑
+          </el-button>
+
+          <template v-if="flowButtsVisable">
+            <el-button type="primary" @click="approvalAgreeHandler">
+              同意
+            </el-button>
+            <el-button type="danger" @click="approvalRefuseHandler">
+              拒绝
+            </el-button>
+          </template>
+
+          <el-button v-if="submitButtVisable" :disabled="id === ''" type="primary" @click="submitButtonHandler">
+            提交
+          </el-button>
+          <el-button v-if="saveButtVisable" type="primary" @click="saveButtonHandler">
             保存
           </el-button>
+
+          <el-button v-if="deleteButtVisable" type="danger" @click="deleteClickedHandler">
+            删除
+          </el-button>
+          <el-button v-if="cancelButtVisable" type="info" @click="revokeClickedHandler">
+            取消
+          </el-button>
+
           <el-button type="info" @click="resetForm()">
             关闭
           </el-button>
         </template>
 
-        <el-row :gutter="24">
-          <!-- 第一行 第一列 -->
-          <el-col :span="6">
-            <el-form-item label="实验室代码" prop="labCode">
-              <el-select v-model="noticeInfo.labCode" placeholder="请选择实验室代码" tabindex="1" :disabled="keyFieldsDisable" style="width: 100%;">
-                <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
-              </el-select>
-              <el-input v-model="noticeInfo.labCodeName" type="hidden" />
-            </el-form-item>
-          </el-col>
+        <el-radio-group v-model="currentLabel" style="margin-bottom: 20px;" @change="radioChangeHandler">
+          <el-radio-button v-for="item in radioItems" :key="item.value" :label="item.name" :disabled="id === ''" />
+        </el-radio-group>
 
-          <el-col :span="6">
-            <el-form-item label="通知单编号">
-              <el-input v-model="noticeInfo.noticeNo" placeholder="通知单编号，保存后自动生成" :disabled="true" />
-            </el-form-item>
-          </el-col>
+        <template v-if="current === 'notice-basic'">
+          <el-row :gutter="24">
+            <!-- 第一行 第一列 -->
+            <el-col :span="6">
+              <el-form-item label="实验室代码" prop="labCode">
+                <el-select v-model="noticeInfo.labCode" placeholder="请选择实验室代码" tabindex="1" :disabled="keyFieldsDisable" style="width: 100%;">
+                  <el-option v-for="dict in labCodeDict" :key="dict.id" :label="dict.name" :value="dict.value" />
+                </el-select>
+                <el-input v-model="noticeInfo.labCodeName" type="hidden" />
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="6">
-            <el-form-item label="创建人">
-              <el-input v-model="noticeInfo.noticeName" type="hidden" />
-              <el-input v-model="noticeInfo.createUserId" type="hidden" />
-              <el-input v-model="noticeInfo.createUserName" :disabled="true" />
-            </el-form-item>
-          </el-col>
+            <el-col :span="6">
+              <el-form-item label="文件编号">
+                <el-input v-model="noticeInfo.noticeNo" placeholder="文件编号，保存后自动生成" :disabled="true" />
+              </el-form-item>
+            </el-col>
 
-          <el-col :span="6">
-            <el-form-item label="创建时间">
-              <el-input v-model="noticeInfo.createTime" :disabled="true" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+            <el-col :span="6">
+              <el-form-item label="文件名称">
+                <el-input v-model="noticeInfo.noticeName" :disabled="true" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item label="委托方" prop="deptId">
+                <el-input v-model="noticeInfo.customerId" type="hidden" />
+                <el-input v-model="noticeInfo.deptId" type="hidden" />
+                <el-input v-model="noticeInfo.customerName" placeholder="请选择委托单位" :disabled="true">
+                  <template #append>
+                    <el-button size="small" :disabled="type === 'detail'" @click="showCustomerFilter">
+                      选择
+                    </el-button>
+                  </template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="要求寄回时间" prop="returnDate">
+                <el-date-picker
+                  v-model="noticeInfo.returnDate" type="date"
+                  format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
+                  placeholder="请选择寄回时间" :clearable="true" :disabled="type === 'detail'"
+                  style="width: 100%;"
+                />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="创建人">
+                <el-input v-model="noticeInfo.noticeName" type="hidden" />
+                <el-input v-model="noticeInfo.createUserId" type="hidden" />
+                <el-input v-model="noticeInfo.createUserName" :disabled="true" />
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="6">
+              <el-form-item label="创建时间">
+                <el-input v-model="noticeInfo.createTime" :disabled="true" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </template>
       </detail-page>
-    </el-form>
 
-    <el-form ref="noticeRef" :model="noticeInfo" :rules="noticeRules" style="display: flex; white-space: nowrap; flex-wrap: wrap;">
-      <el-input v-model="noticeInfo.labCode" type="hidden" />
-      <el-input v-model="noticeInfo.labCodeName" type="hidden" />
-      <el-input v-model="noticeInfo.noticeNo" type="hidden" />
-      <el-input v-model="noticeInfo.noticeName" type="hidden" />
-      <el-input v-model="noticeInfo.createUserId" type="hidden" />
-      <el-input v-model="noticeInfo.createUserName" type="hidden" />
-      <el-input v-model="noticeInfo.createTime" type="hidden" />
-      <detail-block style="margin-top: 20px; width: 100%; font-size: 1.5rem;" title="">
-        <el-row :gutter="24">
-          <el-col :span="24">
-            <div class="notice-title">
-              检测结果复查通知单
-            </div>
-          </el-col>
-        </el-row>
+      <template v-if="current === 'notice-basic'">
+        <table-container title="复查设备清单">
+          <template v-if="type !== 'detail'" #btns-right>
+            <el-button type="primary" @click="addEditableRow()">
+              增加行
+            </el-button>
+            <el-button type="info" @click="delSelectRows()">
+              删除行
+            </el-button>
+          </template>
 
-        <el-row :gutter="24" style="padding: 0 6rem;">
-          <el-form-item label="" prop="deptId">
-            <el-input v-model="noticeInfo.customerId" type="hidden" />
-            <el-input v-model="noticeInfo.deptId" type="hidden" />
-            <el-input v-model="noticeInfo.customerName" placeholder="请选择委托单位" size="large" :disabled="true" style="width: 300px;">
-              <template #append>
-                <el-button size="small" :disabled="type === 'detail'" @click="showCustomerFilter">
-                  选择
-                </el-button>
+          <el-table :data="sampleList" border style="width: 100%;" @selection-change="sampleMultiSelect">
+            <el-table-column v-if="type !== 'detail'" type="selection" align="center" width="38" />
+            <el-table-column align="center" label="序号" width="60" type="index" />
+            <el-table-column
+              v-for="item in samplesColumns"
+              :key="item.value"
+              :prop="item.value"
+              :label="item.text"
+              :width="item.width"
+              align="center"
+            >
+              <template #default="scope">
+                <span v-if="!scope.row.editable">{{ scope.row[item.value] }}</span>
+                <el-input v-else v-model="scope.row[item.value]" :autofocus="true" :placeholder="`${item.text}`" class="input" />
               </template>
-            </el-input>
-          </el-form-item>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 30px; padding: 0 8rem;">
-          <span class="notice-text">由于我站工作失误，贵单位于</span>
-
-          <el-form-item label="" prop="submitDate">
-            <el-date-picker
-              v-model="noticeInfo.submitDate" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择送检时间" :clearable="true" :disabled="type === 'detail'"
-              size="large"
-              style="width: 300px; margin: 0 10px;"
-            />
-          </el-form-item>
-
-          <span class="notice-text">送来的</span>
-
-          <el-form-item label="" prop="deviceName">
-            <el-input
-              v-model="noticeInfo.deviceName" placeholder="设备名称"
-              :clearable="true" :disabled="type === 'detail'"
-              size="large" style="width: 300px; margin: 0 10px;"
-            />
-          </el-form-item>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;padding: 0 6rem;">
-          <el-form-item label="" prop="deviceModel">
-            <el-input
-              v-model="noticeInfo.deviceModel" placeholder="设备型号"
-              :clearable="true" :disabled="type === 'detail'"
-              size="large" style="width: 300px;"
-            />
-          </el-form-item>
-
-          <el-form-item label="" prop="deviceNo">
-            <el-input
-              v-model="noticeInfo.deviceNo" placeholder="设备编号"
-              :clearable="true" :disabled="type === 'detail'"
-              size="large" style="width: 300px; margin: 0 10px;"
-            />
-          </el-form-item>
-
-          <span class="notice-text">测量结果可能有误，需重新进行测试、校准或检定。</span>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 20px;padding: 0 6rem;">
-          <span class="notice-text">请贵单位于</span>
-
-          <el-form-item label="" prop="returnDate">
-            <el-date-picker
-              v-model="noticeInfo.returnDate" type="date"
-              format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-              placeholder="请选择寄回时间" :clearable="true" :disabled="type === 'detail'"
-              style="width: 300px; margin: 0 10px;" size="large"
-            />
-          </el-form-item>
-
-          <span class="notice-text">前将此设备以及证书或报告一同送（寄）回本站，谢谢合作。</span>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 50px;">
-          <el-col :span="6" :offset="10">
-            <span class="notice-text"> 特此通知 </span>
-          </el-col>
-        </el-row>
-
-        <el-row :gutter="24" style="margin-top: 50px;">
-          <el-col :span="6" :offset="12">
-            <span class="notice-text">中国西昌卫星发射中心计量测试站</span>
-
-            <el-form-item label="" prop="noticeDate">
-              <el-date-picker
-                v-model="noticeInfo.noticeDate" type="date"
-                format="YYYY-MM-DD" value-format="YYYY-MM-DD HH:mm:ss"
-                placeholder="请选择通知日期" :clearable="true" :disabled="type === 'detail'"
-                style="width: 300px; margin-top: 20px;" size="large"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </detail-block>
+            </el-table-column>
+          </el-table>
+        </table-container>
+      </template>
     </el-form>
 
+    <approval-dialog
+      ref="apprDial"
+      @on-success="approvalSuccessHandler"
+      @on-refuse="noticeRefuseHandler"
+      @on-revoke="noticeRevokeHandler"
+    />
+
+    <template v-if="current === 'notice-approval' && status !== '1'">
+      <approval-record-table :process-id="noticeInfo.processId" />
+    </template>
+
     <filter-sys-user ref="refFilterSysUser" @record-selected="sysUserSelectedHandler" />
 
     <filter-customer ref="refFilterCustomer" @record-selected="customerSelectedHandler" />
+
+    <filter-sample ref="refFilterSample" @records-selected="sampleSelectedHandler" />
   </app-container>
 </template>
-
-<style scoped>
-.notice-title {
-  text-align: center;
-  font-weight: bold;
-  font-size: 2rem;
-  font-family: SimSun, STSong;
-  margin-bottom: 50px;
-}
-
-.notice-text {
-  font-family: SimSun, STSong;
-  line-height: 40px;
-}
-</style>
diff --git a/src/views/resource/customer/reviewNotice/list.vue b/src/views/resource/customer/reviewNotice/list.vue
index 0226300..f26a000 100644
--- a/src/views/resource/customer/reviewNotice/list.vue
+++ b/src/views/resource/customer/reviewNotice/list.vue
@@ -3,18 +3,34 @@
 import { ElMessage, ElMessageBox, dayjs } from 'element-plus'
 import type { DateModelType } from 'element-plus'
 import type{ ICustomerNoticeInfo, IListQuery } from './customer-notice'
+import type { IMenu } from '@/components/buttonBox/buttonBox'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
-import { deleteReviewNotice, getReviewNoticeList } from '@/api/resource/reviewNotice'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import { getDictByCode } from '@/api/system/dict'
+import { deleteReviewNotice, getReviewNoticeList, refuseApproval, revokeApproval } from '@/api/resource/reviewNotice'
+import ApprovalDialog from '@/views/resource/common/approvalDialog.vue'
+
+const buttonBoxActive = 'reviewNoticeApproval' // 存储在sessionstorage里面的字段名，用于记录右上角buttonbox点击状态
 
 const { proxy } = getCurrentInstance() as any
 const router = useRouter()
 
+// 选中的审批状态按钮
+const active = ref('')
+const menu = ref<IMenu[]>([]) // 审批状态按钮组合
+const approvalStatusList = ref<String[]>([
+  '全部', '已审批', '待审批', '审批', '草稿箱', '审批中', '已通过', '未通过', '已取消',
+])
+
 // 查询条件
 const searchQuery = ref<IListQuery>({
-  noticeNo: '', // 通知单编号
+  noticeNo: '', // 文件编号
   createUserName: '', // 创建人名字
   createTimeStart: '', // 创建时间-起始
   createTimeEnd: '', // 创建时间-结束
+  sendStatus: '',
+  formId: SCHEDULE.REVIEW_NOTICE_APPROVAL,
+  approvalStatus: active.value,
   offset: 1,
   limit: 20,
 })
@@ -24,22 +40,34 @@
 
 // 表头
 const columns = ref<TableColumn[]>([
-  { text: '通知单编号', value: 'noticeNo', align: 'center', width: '175' },
+  { text: '文件编号', value: 'noticeNo', align: 'center', width: '200' },
   { text: '委托方名称', value: 'customerName', align: 'center' },
-  { text: '送检日期', value: 'submitDateStr', align: 'center', width: '120' },
-  { text: '送检设备名称', value: 'deviceName', align: 'center' },
-  { text: '送检设备编号', value: 'deviceNo', align: 'center' },
-  { text: '创建人', value: 'createUserName', align: 'center', width: '120' },
+  { text: '创建人', value: 'createUserName', align: 'center', width: '200' },
   { text: '创建时间', value: 'createTime', align: 'center', width: '180' },
+  { text: '通知是否发送', value: 'sendStatusValue', align: 'center', width: '200' },
+  { text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' },
 ])
+const statusColumn = ref<TableColumn>({ text: '审批状态', value: 'approvalStatusName', align: 'center', width: '100' })
 const noticeList = ref<Array<ICustomerNoticeInfo>>([]) // 表格数据
 
+// 字典值
+const sendStatusDict = [
+  { value: '1', name: '是' },
+  { value: '0', name: '否' },
+]
+
+// 弹窗子组件
+const apprDial = ref()
+
 const reset = () => {
   searchQuery.value = {
-    noticeNo: '', // 通知单编号
+    noticeNo: '', // 文件编号
     createUserName: '', // 创建人名字
     createTimeStart: '', // 创建时间-起始
     createTimeEnd: '', // 创建时间-结束
+    sendStatus: '',
+    formId: SCHEDULE.REVIEW_NOTICE_APPROVAL,
+    approvalStatus: active.value,
     offset: 1,
     limit: 20,
   }
@@ -102,22 +130,46 @@
     query: {
       type: 'update',
       id: row.id,
+      status: active.value,
     },
     path: 'reviewNotice/detail',
   })
 }
 
 const detail = (row: ICustomerNoticeInfo) => {
-  // 将行数据存入缓存 用来在路由之间传递数据
-  sessionStorage.setItem('reviewNoticeInfo', JSON.stringify(row))
-
-  router.push({
-    query: {
-      type: 'detail',
-      id: row.id,
-    },
-    path: 'reviewNotice/detail',
-  })
+  if (active.value === '0') {
+    // 全部时 查看和打印文件流
+    router.push({
+      query: {
+        id: row.id,
+      },
+      path: 'reviewNotice/approved/detail',
+    })
+  }
+  else if (active.value === '1') {
+    // 草稿箱 状态下的查看 可以编辑
+    sessionStorage.setItem('reviewNoticeInfo', JSON.stringify(row))
+    router.push({
+      query: {
+        type: 'update',
+        id: row.id,
+        status: active.value,
+      },
+      path: 'reviewNotice/detail',
+    })
+  }
+  else {
+    // 将行数据存入缓存 用来在路由之间传递数据
+    sessionStorage.setItem('reviewNoticeInfo', JSON.stringify(row))
+    router.push({
+      query: {
+        type: 'detail',
+        id: row.id,
+        status: active.value,
+      },
+      path: 'reviewNotice/detail',
+    })
+  }
 }
 
 const deleteNoticeById = (row: ICustomerNoticeInfo) => {
@@ -142,6 +194,124 @@
   })
 }
 
+// 审批按钮点击切换事件
+const changeCurrentButton = (val: string) => {
+  active.value = val // 此时的tab
+  window.sessionStorage.setItem(buttonBoxActive, val) // 记录tab状态
+
+  const hasStatus = columns.value.filter((col) => {
+    return col.value === statusColumn.value.value
+  })
+
+  if (val === '0') {
+    // 全部的时候不要显示审批状态
+    if (hasStatus.length > 0) {
+      columns.value.pop()
+    }
+  }
+  else {
+    // 其他状态下要显示审批状态字段
+    if (hasStatus.length === 0) {
+      columns.value.push(statusColumn.value)
+    }
+  }
+
+  reset() // 刷新
+}
+
+// 流程审批-同意
+const approvalAgreeHandler = (row: ICustomerNoticeInfo) => {
+  apprDial.value.initDialog('agree', row.id, row.taskId, '')
+}
+
+// 流程审批-拒绝
+const approvalRefuseHandler = (row: ICustomerNoticeInfo) => {
+  apprDial.value.initDialog('refuse', row.id, row.taskId, '')
+}
+
+// 取消（撤回审批单）
+const revokeApprById = (row: ICustomerNoticeInfo) => {
+  apprDial.value.initDialog('revoke', row.id, row.taskId, row.processId)
+}
+
+// 流程操作之后刷新
+const afterApprovalHandler = () => {
+  fetchData(true)
+}
+
+// 取消
+const noteRevokeHandler = (param: any) => {
+  revokeApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('流程取消成功')
+    }
+    else {
+      ElMessage.error(`流程取消失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    fetchData(true)
+  })
+}
+
+// 拒绝
+const noteRefuseHandler = (param: any) => {
+  refuseApproval(param).then((res) => {
+    if (res.code === 200) {
+      ElMessage.success('拒绝审批完成')
+    }
+    else {
+      ElMessage.error(`拒绝审批失败：${res.message}`)
+    }
+    // 关闭弹窗
+    apprDial.value.handleClose()
+
+    fetchData(true)
+  })
+}
+
+// 初始化流程审批状态按钮
+const getApprovalStatusDict = async () => {
+  await getDictByCode('approvalStatus').then((res) => {
+    if (res.code === 200) {
+      approvalStatusList.value.forEach((item) => {
+        const tempFindData = res.data.find((e: { name: string; value: string }) => e.name === item)
+        if (tempFindData) {
+          menu.value.push({
+            name: tempFindData.name,
+            id: `${tempFindData.value}`,
+          })
+        }
+      })
+    }
+  })
+}
+
+const getLabCodeDict = async () => {
+  await getDictByCode('bizLabCode').then((res) => {
+    if (res.code === 200) {
+      sessionStorage.setItem('bizLabCode', JSON.stringify(res.data)) // 放到缓存中
+    }
+  })
+}
+
+const getEqptDeviceCategoryDict = async () => {
+  await getDictByCode('eqptDeviceCategory').then((res) => {
+    if (res.code === 200) {
+      sessionStorage.setItem('eqptDeviceCategory', JSON.stringify(res.data)) // 放到缓存中
+    }
+  })
+}
+
+const getMeterIdentifyDict = async () => {
+  await getDictByCode('eqptMeterIdentify').then((res) => {
+    if (res.code === 200) {
+      sessionStorage.setItem('eqptMeterIdentify', JSON.stringify(res.data)) // 放到缓存中
+    }
+  })
+}
+
 watch(dateRange, (val) => {
   if (val) {
     searchQuery.value.createTimeStart = dayjs(val[0]).format('YYYY-MM-DD') === 'Invalid Date' ? '' : dayjs(val[0]).format('YYYY-MM-DD')
@@ -153,8 +323,22 @@
   }
 })
 
+const getDict = async () => {
+  await getApprovalStatusDict()
+  await getLabCodeDict()
+  await getEqptDeviceCategoryDict()
+  await getMeterIdentifyDict()
+}
+
 onMounted(async () => {
-  searchList()
+  await getDict()
+
+  if (sessionStorage.getItem(buttonBoxActive) !== undefined && sessionStorage.getItem(buttonBoxActive) !== null) {
+    active.value = sessionStorage.getItem(buttonBoxActive)!
+  }
+  else {
+    active.value = '0' // 全部
+  }
 })
 </script>
 
@@ -163,7 +347,7 @@
     <!-- 筛选条件 -->
     <search-area :need-clear="true" @search="searchList" @clear="reset">
       <search-item>
-        <el-input v-model="searchQuery.noticeNo" placeholder="通知单编号" clearable />
+        <el-input v-model="searchQuery.noticeNo" placeholder="文件编号" clearable />
       </search-item>
       <search-item>
         <el-input v-model="searchQuery.createUserName" placeholder="创建人" clearable />
@@ -171,6 +355,11 @@
       <search-item>
         <el-date-picker v-model="dateRange" type="daterange" start-placeholder="创建时间（开始）" end-placeholder="创建时间（结束）" />
       </search-item>
+      <search-item>
+        <el-select v-model="searchQuery.sendStatus" placeholder="请选择通知是否发送" clearable>
+          <el-option v-for="dict in sendStatusDict" :key="dict.value" :value="dict.value" :label="dict.name" />
+        </el-select>
+      </search-item>
     </search-area>
 
     <!-- 表格数据展示 -->
@@ -197,19 +386,41 @@
         <template #columns>
           <el-table-column fixed="right" label="操作" align="center" width="130">
             <template #default="{ row }">
-              <el-button v-if="proxy.hasPerm('/resource/customer/reviewNotice/edit')" size="small" type="primary" link @click="updateInfo(row)">
-                编辑
-              </el-button>
               <el-button size="small" type="primary" link @click="detail(row)">
                 详情
               </el-button>
-              <el-button v-if="proxy.hasPerm('/resource/customer/reviewNotice/del')" size="small" type="danger" link @click="deleteNoticeById(row)">
+              <el-button v-if="(active === '1' || active === '6') && proxy.hasPerm('/resource/customer/reviewNotice/del')" size="small" type="danger" link @click="deleteNoticeById(row)">
                 删除
               </el-button>
+
+              <template v-if="active === '2'">
+                <el-button size="small" type="primary" link @click="approvalAgreeHandler(row)">
+                  同意
+                </el-button>
+                <el-button size="small" type="danger" link @click="approvalRefuseHandler(row)">
+                  拒绝
+                </el-button>
+              </template>
+              <template v-if="active === '3'">
+                <el-button size="small" type="info" link @click="revokeApprById(row)">
+                  取消
+                </el-button>
+              </template>
             </template>
           </el-table-column>
         </template>
       </normal-table>
     </table-container>
+
+    <!-- 审批单弹窗 -->
+    <approval-dialog
+      ref="apprDial"
+      @on-success="afterApprovalHandler"
+      @on-refuse="noteRefuseHandler"
+      @on-revoke="noteRevokeHandler"
+    />
+
+    <!-- 右上角按钮集合 -->
+    <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
   </app-container>
 </template>