diff --git a/src/api/quality/correct/index.ts b/src/api/quality/correct/index.ts
new file mode 100644
index 0000000..a612bb8
--- /dev/null
+++ b/src/api/quality/correct/index.ts
@@ -0,0 +1,87 @@
+/**
+ * 纠正措施处理单相关接口
+ */
+import request from '../../index'
+
+// 纠正措施处理单列表查询-分页
+export function getQualityCorrectList(data: any) {
+  return request({
+    url: `/quality/bizQualityCorrectiveRecord/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 取消审批
+export function cancelApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除-草稿箱
+export function draftDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/draftDelete',
+    method: 'post',
+    data,
+  })
+}
+// 删除 -已取消
+export function approvalDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delteQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/delete',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/submit',
+    method: 'post',
+    data,
+  })
+}
+// 审批 -拒绝
+export function refuseApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/refuse',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/detail',
+    method: 'get',
+    params: data,
+  })
+}
+// 新建
+export function addQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/add',
+    method: 'post',
+    data,
+  })
+}
+// 更新
+export function updateQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/update',
+    method: 'post',
+    data,
+  })
+}

diff --git a/src/api/quality/correct/index.ts b/src/api/quality/correct/index.ts
new file mode 100644
index 0000000..a612bb8
--- /dev/null
+++ b/src/api/quality/correct/index.ts
@@ -0,0 +1,87 @@
+/**
+ * 纠正措施处理单相关接口
+ */
+import request from '../../index'
+
+// 纠正措施处理单列表查询-分页
+export function getQualityCorrectList(data: any) {
+  return request({
+    url: `/quality/bizQualityCorrectiveRecord/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 取消审批
+export function cancelApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除-草稿箱
+export function draftDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/draftDelete',
+    method: 'post',
+    data,
+  })
+}
+// 删除 -已取消
+export function approvalDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delteQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/delete',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/submit',
+    method: 'post',
+    data,
+  })
+}
+// 审批 -拒绝
+export function refuseApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/refuse',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/detail',
+    method: 'get',
+    params: data,
+  })
+}
+// 新建
+export function addQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/add',
+    method: 'post',
+    data,
+  })
+}
+// 更新
+export function updateQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/quality.ts b/src/router/modules/quality.ts
index 95a8670..00c5831 100644
--- a/src/router/modules/quality.ts
+++ b/src/router/modules/quality.ts
@@ -492,7 +492,7 @@
         },
       },
       {
-        path: '/correcthandle/:type',
+        path: '/correcthandle/:type/:id?',
         name: 'CorrectHandleEdit',
         component: () => import('@/views/quality/correct/handle/components/edit.vue'),
         meta: {

diff --git a/src/api/quality/correct/index.ts b/src/api/quality/correct/index.ts
new file mode 100644
index 0000000..a612bb8
--- /dev/null
+++ b/src/api/quality/correct/index.ts
@@ -0,0 +1,87 @@
+/**
+ * 纠正措施处理单相关接口
+ */
+import request from '../../index'
+
+// 纠正措施处理单列表查询-分页
+export function getQualityCorrectList(data: any) {
+  return request({
+    url: `/quality/bizQualityCorrectiveRecord/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 取消审批
+export function cancelApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除-草稿箱
+export function draftDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/draftDelete',
+    method: 'post',
+    data,
+  })
+}
+// 删除 -已取消
+export function approvalDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delteQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/delete',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/submit',
+    method: 'post',
+    data,
+  })
+}
+// 审批 -拒绝
+export function refuseApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/refuse',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/detail',
+    method: 'get',
+    params: data,
+  })
+}
+// 新建
+export function addQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/add',
+    method: 'post',
+    data,
+  })
+}
+// 更新
+export function updateQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/quality.ts b/src/router/modules/quality.ts
index 95a8670..00c5831 100644
--- a/src/router/modules/quality.ts
+++ b/src/router/modules/quality.ts
@@ -492,7 +492,7 @@
         },
       },
       {
-        path: '/correcthandle/:type',
+        path: '/correcthandle/:type/:id?',
         name: 'CorrectHandleEdit',
         component: () => import('@/views/quality/correct/handle/components/edit.vue'),
         meta: {
diff --git a/src/views/quality/agree.ts b/src/views/quality/agree.ts
index e619ac3..6dc06cc 100644
--- a/src/views/quality/agree.ts
+++ b/src/views/quality/agree.ts
@@ -3,4 +3,5 @@
   QUALITY_SUPERVISION_RECORD_APPROVAL = '/quality/bizQualitySupervisionRep/agree', // 质量监督报告
   NONCONFORMITY_ANALYSIS_APPROVAL = '/quality/bizQualityNonConformanceRep/agree', // 不符合要求情况分析报告
   PREVENT_MEASURE_PROCESS_SHEET_APPROVAL = '/quality/bizQualityPreventRecord/agree', // 预防措施处理单
+  CORRECT_MEASURE_PROCESS_SHEET_APPROVAL = '/quality/bizQualityCorrectiveRecord/agree', // 纠正措施处理单
 }

diff --git a/src/api/quality/correct/index.ts b/src/api/quality/correct/index.ts
new file mode 100644
index 0000000..a612bb8
--- /dev/null
+++ b/src/api/quality/correct/index.ts
@@ -0,0 +1,87 @@
+/**
+ * 纠正措施处理单相关接口
+ */
+import request from '../../index'
+
+// 纠正措施处理单列表查询-分页
+export function getQualityCorrectList(data: any) {
+  return request({
+    url: `/quality/bizQualityCorrectiveRecord/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 取消审批
+export function cancelApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除-草稿箱
+export function draftDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/draftDelete',
+    method: 'post',
+    data,
+  })
+}
+// 删除 -已取消
+export function approvalDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delteQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/delete',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/submit',
+    method: 'post',
+    data,
+  })
+}
+// 审批 -拒绝
+export function refuseApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/refuse',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/detail',
+    method: 'get',
+    params: data,
+  })
+}
+// 新建
+export function addQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/add',
+    method: 'post',
+    data,
+  })
+}
+// 更新
+export function updateQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/quality.ts b/src/router/modules/quality.ts
index 95a8670..00c5831 100644
--- a/src/router/modules/quality.ts
+++ b/src/router/modules/quality.ts
@@ -492,7 +492,7 @@
         },
       },
       {
-        path: '/correcthandle/:type',
+        path: '/correcthandle/:type/:id?',
         name: 'CorrectHandleEdit',
         component: () => import('@/views/quality/correct/handle/components/edit.vue'),
         meta: {
diff --git a/src/views/quality/agree.ts b/src/views/quality/agree.ts
index e619ac3..6dc06cc 100644
--- a/src/views/quality/agree.ts
+++ b/src/views/quality/agree.ts
@@ -3,4 +3,5 @@
   QUALITY_SUPERVISION_RECORD_APPROVAL = '/quality/bizQualitySupervisionRep/agree', // 质量监督报告
   NONCONFORMITY_ANALYSIS_APPROVAL = '/quality/bizQualityNonConformanceRep/agree', // 不符合要求情况分析报告
   PREVENT_MEASURE_PROCESS_SHEET_APPROVAL = '/quality/bizQualityPreventRecord/agree', // 预防措施处理单
+  CORRECT_MEASURE_PROCESS_SHEET_APPROVAL = '/quality/bizQualityCorrectiveRecord/agree', // 纠正措施处理单
 }
diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue
index 7e9772c..ad606b0 100644
--- a/src/views/quality/correct/handle/components/edit.vue
+++ b/src/views/quality/correct/handle/components/edit.vue
@@ -1,154 +1,430 @@
 <!-- 纠正措施处理单编辑页面 -->
-<script name="QualityPreventHandler" lang="ts" setup>
+<script name="QualityCorrectHandler" lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import NonConformanceRep from '@/views/quality/prevent/handle/components/NonConformanceRep.vue'
+import { addQualityCorrect, approvalDelete, cancelApproval, delteQualityCorrect, detailQualityCorrect, draftDelete, refuseApproval, submitQualityCorrect, updateQualityCorrect } from '@/api/quality/correct/index'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
+import { getSearchDept } from '@/api/quality/supervise/record'
+import { AGREE } from '@/views/quality/agree'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ApprovalDialog from '@/components/ApprovalCustom/ApprovalDialog.vue'
+// 路由相关
 const $route = useRoute()
 const $router = useRouter()
+// 用户信息仓库
 const userStore = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
-const dialogStatus = ref('create')
+// 当前审批状态名字
+const approvalStatusName = $route.query.approvalStatusName as string
+// 表单
 const ruleForm = ref({
-  createTime: '',
+  fileName: '预防措施处理单',
+  bizLabCode: '',
+  supDeptId: '',
+  fileCode: '',
+  creator: '',
+  creatorName: '',
+  logTime: '',
   id: '',
-  temName: '',
-  temTip: '',
-  updateId: '',
-  updateName: '',
-  updateTime: '',
-}) // 表单
-const rules = ref<FormRules>({
-  temName: [{ required: true, message: '模板名称必填', trigger: ['blur', 'change'] }],
-}) // 表单验证规则
-// 模板管理内容列表
-onMounted(() => {
-  // const data = JSON.parse($route.query.row as string)
-  // ruleForm.value = data
-
-  // // 获取当前用户信息
-  // ruleForm.value.updateTime = dayjs().format('YYYY-MM-DD HH:mm') // 创建时间
-  // ruleForm.value.updateId = userStore.id
-  // ruleForm.value.updateName = userStore.name
+  correctiveActionFiles: [] as any[],
+  description: '',
+  taskId: '',
 })
-// 保存
+// 表单验证规则
+const rules = ref<FormRules>({
+  bizLabCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
+  correctiveActionFiles: [{ required: true, message: '关联输入文件必选', trigger: ['blur', 'change'] }],
+  supDeptId: [{ required: true, message: '部门必选', trigger: ['blur', 'change'] }],
+})
+// 填充数据
+const fillData = () => {
+  if (sessionStorage.getItem('QualityCorrectHandler-info-flag')) {
+    ruleForm.value = JSON.parse(sessionStorage.getItem('QualityCorrectHandler-info') as string)
+    // 清空存储
+    sessionStorage.removeItem('QualityCorrectHandler-info-flag')
+    sessionStorage.removeItem('QualityCorrectHandler-info')
+    return false
+  }
+}
+
+const labelList = ref<{ id: string; value: string; name: string }[]>()// 实验室代码
+const deptList = ref<any[]>()// 部门
+// 获取字典值
+const fetchDict = () => {
+// 获取实验室代码字典
+  getDictByCode('bizLabCode').then((res) => {
+    labelList.value = res.data
+  })
+  // 部门
+  getSearchDept({ labCode: '' }).then((res) => {
+    deptList.value = res.data
+  })
+}
+fetchDict()
+// 监听实验室变化修改部门
+const watchFlag = ref(true)
+watch(() => ruleForm.value.bizLabCode, (newVal) => {
+  if (newVal) {
+    if ($route.path.includes('detail') || watchFlag.value) { return }
+    ruleForm.value.supDeptId = ''
+    getSearchDept({ labCode: newVal }).then((res) => {
+      deptList.value = res.data
+    })
+  }
+}, {
+  deep: true,
+})
+// 页面初始化
+onMounted(() => {
+  if ($route.path.includes('create')) {
+    watchFlag.value = false
+    // 默认填充信息
+    fillData()
+    ruleForm.value.creator = userStore.id
+    ruleForm.value.creatorName = userStore.name
+    ruleForm.value.logTime = dayjs().format('YYYY-MM-DD HH:mm')
+    // 自动关联不符合报告(启动纠正措施管理)
+    if ($route.params.id) {
+      ruleForm.value.correctiveActionFiles = [{ ...JSON.parse($route.query.row as string), fileType: '1' }]
+    }
+  }
+  else {
+    fillData()
+    detailQualityCorrect({ id: $route.params.id as string }).then((res) => {
+      // 详情
+      // console.log(res.data, '详情')
+      ruleForm.value = res.data
+      setTimeout(() => {
+        watchFlag.value = false
+      }, 500)
+    })
+  }
+})
+// ---------------------------------------------保存相关--------------------------------------
+const infoId = ref('')
+const createRow = () => {
+  addQualityCorrect(ruleForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    infoId.value = res.data
+  })
+}
+const updateRow = () => {
+  updateQualityCorrect(ruleForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    infoId.value = res.data
+    if (approvalStatusName === '已取消' || approvalStatusName === '未通过') {
+      handleSubmit()
+    }
+  })
+}
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-      })
+      if ($route.path.includes('create')) {
+        createRow()
+      }
+      else if ($route.path.includes('update')) {
+        updateRow()
+      }
     }
   })
 }
+// ---------------------------------------------审批--------------------------------------
+const taskId = ref($route.query.taskId as string || '') // 任务id，用于同意、驳回、拒绝审批
+const processId = ref($route.query.processId as string || '') // 流程实例id
+const approvalDialog = ref() // 审批组件ref
+const showApprovalButton = ref(true) // 是否展示审批按钮
+// 审批结束回调
+const approvalSuccess = () => {
+  showApprovalButton.value = false
+}
+// 审批
+const handleApprove = (val: string) => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+      id: ruleForm.value.id,
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已取消',
+          })
+          showApprovalButton.value = false
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value, ruleForm.value.id)
+  }
+}
+// 拒绝
+const refuse = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
+    ElMessage({
+      type: 'success',
+      message: '已拒绝',
+    })
+    showApprovalButton.value = false
+  })
+}
+// 点击提交
+function handleSubmit() {
+  if (infoId.value || ruleForm.value.id) {
+    submitQualityCorrect({
+      formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL,
+      // processId: infoId.value,
+      id: infoId.value || ruleForm.value.id,
+    }).then(() => {
+      ElMessage.success('提交成功')
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存')
+  }
+}
+// 点击编辑
+const handleEdit = () => {
+  $router.push({
+    path: `/correcthandle/update/${ruleForm.value.id}`,
+    query: { ...$route.query },
+  })
+}
+const del = () => {
+  if (approvalStatusName === '草稿箱') {
+    draftDelete({ id: ruleForm.value.id }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+  else if (approvalStatusName === '已取消') {
+    approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+  else if (approvalStatusName === '全部') { // 全部的删除
+    delteQualityCorrect({ id: ruleForm.value.id }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+}
+// 关闭页面
+function close() {
+  $router.push({
+    path: '/correct/correcthandle',
+  })
+}
+const showMenu = ref('基本信息')
+defineExpose({
+  ruleForm, showMenu,
+})
+// 不符合要求情况分析报告弹窗
+const conformanceRef = ref()
+// 打开弹窗
+const selectConformance = () => {
+  conformanceRef.value.initDialog()
+}
+// 确认报告
+const confirmConformance = (report: any) => {
+  console.log(report, 'report')
+  ruleForm.value.correctiveActionFiles = report
+  ruleFormRef.value?.clearValidate('correctiveActionFiles')
+}
+// 报告详情
+const goDetail = () => {
+  const data = ruleForm.value.correctiveActionFiles[0]
+  sessionStorage.setItem('QualityCorrectHandler-info', JSON.stringify(ruleForm.value))
+  $router.push({
+    path: `/superviseanalysis/detail/${data.id}`,
+    query: {
+      approvalStatusName: '全部', // 审批状态名称
+      processId: data.processId, // 流程实例id
+      taskId: data.taskId, // 任务id
+      id: data.id,
+    },
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
-    <detail-page title="纠正措施处理单">
+    <!-- 不符合要求情况分析报告弹窗 -->
+    <non-conformance-rep ref="conformanceRef" @add="confirmConformance" />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :agree="AGREE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL" @on-success="approvalSuccess" @refuse="refuse" />
+    <detail-page title="预防措施处理单" class="info-header">
       <template #btns>
-        <el-button type="primary">
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '待审批' && showApprovalButton" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '待审批' && showApprovalButton" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '审批中' && showApprovalButton" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- :disabled="!infoId" -->
+        <el-button
+          v-if="$route.path.includes('create') || ($route.path.includes('update') && approvalStatusName !== '未通过' && approvalStatusName !== '已取消')"
+          type="primary"
+          @click="handleSubmit"
+        >
           提交
         </el-button>
-        <el-button type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="approvalStatusName !== '已审批' && $route.path.includes('detail') && approvalStatusName === '未通过'" type="primary" @click="handleEdit">
+          编辑
+        </el-button>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
-        <el-button type="info" @click="() => $router.go(-1)">
+        <el-button v-if="approvalStatusName === '已取消'" type="danger" @click="del">
+          删除
+        </el-button>
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <detail-block title="">
-      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+    <detail-page v-if="approvalStatusName !== '草稿箱' && !$route.path.includes('create')" title="" class="info-radio">
+      <el-radio-group v-model="showMenu">
+        <el-radio-button label="基本信息" />
+        <el-radio-button label="审批详情" />
+      </el-radio-group>
+    </detail-page>
+    <!-- 基本信息 -->
+    <el-form v-show="showMenu === '基本信息'" ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <detail-block title="">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="temTip">
+            <el-form-item label="实验室代码" prop="bizLabCode">
               <el-select
-                v-model="ruleForm.storageLocation"
+                v-model="ruleForm.bizLabCode"
                 placeholder="实验室代码"
                 class="short-input"
                 filterable
                 style="width: 100%;"
               >
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="责任部门" prop="temTip">
+            <el-form-item label="部门" prop="supDeptId">
               <el-select
-                v-model="ruleForm.storageLocation"
-                placeholder="责任部门"
+                v-model="ruleForm.supDeptId"
+                placeholder="部门"
                 class="short-input"
                 filterable
                 style="width: 100%;"
               >
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="文件编号" prop="temName">
-              <el-input v-model.trim="ruleForm.temName" />
+            <el-form-item label="处理单编号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="处理单名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="文件名称" prop="updateName">
-              <el-input v-model.trim="ruleForm.updateName" disabled />
+            <el-form-item label="提出人" prop="creatorName">
+              <el-input v-model.trim="ruleForm.creatorName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="提出人" prop="updateName">
-              <el-input v-model.trim="ruleForm.updateName" disabled />
+            <el-form-item label="记录时间" prop="logTime">
+              <!-- <el-input v-model.trim="ruleForm.logTime" disabled /> -->
+              <el-date-picker
+                v-model="ruleForm.logTime"
+                type="datetime"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间" prop="updateTime">
-              <!-- <el-input v-model.trim="ruleForm.time" disabled /> -->
-              <el-input v-model.trim="ruleForm.updateTime" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label-width="200px" label="关联不符合要求情况分析报告" prop="updateTime">
+            <el-form-item label-width="220px" label="关联输入文件" prop="correctiveActionFiles">
               <!-- <el-input v-model.trim="ruleForm.time" disabled /> -->
-              <el-button type="primary">
+              <el-link
+                v-if="ruleForm.correctiveActionFiles.length"
+                type="primary"
+                style="margin-right: 10px;"
+                @click="goDetail"
+              >
+                <!-- {{ ruleForm.correctiveActionFiles.length ? `${ruleForm.correctiveActionFiles[0].fileCode}-${ruleForm.correctiveActionFiles[0].fileName}` : '' }} -->
+                {{ ruleForm.correctiveActionFiles.length ? `${ruleForm.correctiveActionFiles[0].fileName}` : '' }}
+              </el-link>
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="selectConformance">
                 选择
               </el-button>
-              <el-button type="primary">
-                上传
-              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-    </detail-block>
-    <detail-block title="">
-      <el-form :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <el-form-item label-width="200px" label="存在不符合要求事实陈述" prop="conferenceTime" />
-          </el-col>
-        </el-row>
+      </detail-block>
+      <detail-block title="">
         <el-row :gutter="24" class="marg">
           <el-col :span="22">
-            <el-form-item label-width="200px" label="" prop="conferenceTime">
-              <el-input v-model.trim="ruleForm.conferenceTime" placeholder="存在不符合要求事实陈述" :rows="3" type="textarea" />
+            <el-form-item label-width="200px" label="存在不符合要求事实陈述" prop="description">
+              <el-input v-model.trim="ruleForm.description" placeholder="存在不符合要求事实陈述" :rows="3" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-    </detail-block>
+      </detail-block>
+    </el-form>
+    <!-- 审批详情 -->
+    <approval-record-table v-if="showMenu === '审批详情'" :process-id="processId" />
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
+.info-radio {
+  ::v-deep(.header) {
+    display: none;
+  }
+}
+</style>

diff --git a/src/api/quality/correct/index.ts b/src/api/quality/correct/index.ts
new file mode 100644
index 0000000..a612bb8
--- /dev/null
+++ b/src/api/quality/correct/index.ts
@@ -0,0 +1,87 @@
+/**
+ * 纠正措施处理单相关接口
+ */
+import request from '../../index'
+
+// 纠正措施处理单列表查询-分页
+export function getQualityCorrectList(data: any) {
+  return request({
+    url: `/quality/bizQualityCorrectiveRecord/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 取消审批
+export function cancelApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除-草稿箱
+export function draftDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/draftDelete',
+    method: 'post',
+    data,
+  })
+}
+// 删除 -已取消
+export function approvalDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delteQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/delete',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/submit',
+    method: 'post',
+    data,
+  })
+}
+// 审批 -拒绝
+export function refuseApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/refuse',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/detail',
+    method: 'get',
+    params: data,
+  })
+}
+// 新建
+export function addQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/add',
+    method: 'post',
+    data,
+  })
+}
+// 更新
+export function updateQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/quality.ts b/src/router/modules/quality.ts
index 95a8670..00c5831 100644
--- a/src/router/modules/quality.ts
+++ b/src/router/modules/quality.ts
@@ -492,7 +492,7 @@
         },
       },
       {
-        path: '/correcthandle/:type',
+        path: '/correcthandle/:type/:id?',
         name: 'CorrectHandleEdit',
         component: () => import('@/views/quality/correct/handle/components/edit.vue'),
         meta: {
diff --git a/src/views/quality/agree.ts b/src/views/quality/agree.ts
index e619ac3..6dc06cc 100644
--- a/src/views/quality/agree.ts
+++ b/src/views/quality/agree.ts
@@ -3,4 +3,5 @@
   QUALITY_SUPERVISION_RECORD_APPROVAL = '/quality/bizQualitySupervisionRep/agree', // 质量监督报告
   NONCONFORMITY_ANALYSIS_APPROVAL = '/quality/bizQualityNonConformanceRep/agree', // 不符合要求情况分析报告
   PREVENT_MEASURE_PROCESS_SHEET_APPROVAL = '/quality/bizQualityPreventRecord/agree', // 预防措施处理单
+  CORRECT_MEASURE_PROCESS_SHEET_APPROVAL = '/quality/bizQualityCorrectiveRecord/agree', // 纠正措施处理单
 }
diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue
index 7e9772c..ad606b0 100644
--- a/src/views/quality/correct/handle/components/edit.vue
+++ b/src/views/quality/correct/handle/components/edit.vue
@@ -1,154 +1,430 @@
 <!-- 纠正措施处理单编辑页面 -->
-<script name="QualityPreventHandler" lang="ts" setup>
+<script name="QualityCorrectHandler" lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import NonConformanceRep from '@/views/quality/prevent/handle/components/NonConformanceRep.vue'
+import { addQualityCorrect, approvalDelete, cancelApproval, delteQualityCorrect, detailQualityCorrect, draftDelete, refuseApproval, submitQualityCorrect, updateQualityCorrect } from '@/api/quality/correct/index'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
+import { getSearchDept } from '@/api/quality/supervise/record'
+import { AGREE } from '@/views/quality/agree'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ApprovalDialog from '@/components/ApprovalCustom/ApprovalDialog.vue'
+// 路由相关
 const $route = useRoute()
 const $router = useRouter()
+// 用户信息仓库
 const userStore = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
-const dialogStatus = ref('create')
+// 当前审批状态名字
+const approvalStatusName = $route.query.approvalStatusName as string
+// 表单
 const ruleForm = ref({
-  createTime: '',
+  fileName: '预防措施处理单',
+  bizLabCode: '',
+  supDeptId: '',
+  fileCode: '',
+  creator: '',
+  creatorName: '',
+  logTime: '',
   id: '',
-  temName: '',
-  temTip: '',
-  updateId: '',
-  updateName: '',
-  updateTime: '',
-}) // 表单
-const rules = ref<FormRules>({
-  temName: [{ required: true, message: '模板名称必填', trigger: ['blur', 'change'] }],
-}) // 表单验证规则
-// 模板管理内容列表
-onMounted(() => {
-  // const data = JSON.parse($route.query.row as string)
-  // ruleForm.value = data
-
-  // // 获取当前用户信息
-  // ruleForm.value.updateTime = dayjs().format('YYYY-MM-DD HH:mm') // 创建时间
-  // ruleForm.value.updateId = userStore.id
-  // ruleForm.value.updateName = userStore.name
+  correctiveActionFiles: [] as any[],
+  description: '',
+  taskId: '',
 })
-// 保存
+// 表单验证规则
+const rules = ref<FormRules>({
+  bizLabCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
+  correctiveActionFiles: [{ required: true, message: '关联输入文件必选', trigger: ['blur', 'change'] }],
+  supDeptId: [{ required: true, message: '部门必选', trigger: ['blur', 'change'] }],
+})
+// 填充数据
+const fillData = () => {
+  if (sessionStorage.getItem('QualityCorrectHandler-info-flag')) {
+    ruleForm.value = JSON.parse(sessionStorage.getItem('QualityCorrectHandler-info') as string)
+    // 清空存储
+    sessionStorage.removeItem('QualityCorrectHandler-info-flag')
+    sessionStorage.removeItem('QualityCorrectHandler-info')
+    return false
+  }
+}
+
+const labelList = ref<{ id: string; value: string; name: string }[]>()// 实验室代码
+const deptList = ref<any[]>()// 部门
+// 获取字典值
+const fetchDict = () => {
+// 获取实验室代码字典
+  getDictByCode('bizLabCode').then((res) => {
+    labelList.value = res.data
+  })
+  // 部门
+  getSearchDept({ labCode: '' }).then((res) => {
+    deptList.value = res.data
+  })
+}
+fetchDict()
+// 监听实验室变化修改部门
+const watchFlag = ref(true)
+watch(() => ruleForm.value.bizLabCode, (newVal) => {
+  if (newVal) {
+    if ($route.path.includes('detail') || watchFlag.value) { return }
+    ruleForm.value.supDeptId = ''
+    getSearchDept({ labCode: newVal }).then((res) => {
+      deptList.value = res.data
+    })
+  }
+}, {
+  deep: true,
+})
+// 页面初始化
+onMounted(() => {
+  if ($route.path.includes('create')) {
+    watchFlag.value = false
+    // 默认填充信息
+    fillData()
+    ruleForm.value.creator = userStore.id
+    ruleForm.value.creatorName = userStore.name
+    ruleForm.value.logTime = dayjs().format('YYYY-MM-DD HH:mm')
+    // 自动关联不符合报告(启动纠正措施管理)
+    if ($route.params.id) {
+      ruleForm.value.correctiveActionFiles = [{ ...JSON.parse($route.query.row as string), fileType: '1' }]
+    }
+  }
+  else {
+    fillData()
+    detailQualityCorrect({ id: $route.params.id as string }).then((res) => {
+      // 详情
+      // console.log(res.data, '详情')
+      ruleForm.value = res.data
+      setTimeout(() => {
+        watchFlag.value = false
+      }, 500)
+    })
+  }
+})
+// ---------------------------------------------保存相关--------------------------------------
+const infoId = ref('')
+const createRow = () => {
+  addQualityCorrect(ruleForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    infoId.value = res.data
+  })
+}
+const updateRow = () => {
+  updateQualityCorrect(ruleForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    infoId.value = res.data
+    if (approvalStatusName === '已取消' || approvalStatusName === '未通过') {
+      handleSubmit()
+    }
+  })
+}
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-      })
+      if ($route.path.includes('create')) {
+        createRow()
+      }
+      else if ($route.path.includes('update')) {
+        updateRow()
+      }
     }
   })
 }
+// ---------------------------------------------审批--------------------------------------
+const taskId = ref($route.query.taskId as string || '') // 任务id，用于同意、驳回、拒绝审批
+const processId = ref($route.query.processId as string || '') // 流程实例id
+const approvalDialog = ref() // 审批组件ref
+const showApprovalButton = ref(true) // 是否展示审批按钮
+// 审批结束回调
+const approvalSuccess = () => {
+  showApprovalButton.value = false
+}
+// 审批
+const handleApprove = (val: string) => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+      id: ruleForm.value.id,
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已取消',
+          })
+          showApprovalButton.value = false
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value, ruleForm.value.id)
+  }
+}
+// 拒绝
+const refuse = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
+    ElMessage({
+      type: 'success',
+      message: '已拒绝',
+    })
+    showApprovalButton.value = false
+  })
+}
+// 点击提交
+function handleSubmit() {
+  if (infoId.value || ruleForm.value.id) {
+    submitQualityCorrect({
+      formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL,
+      // processId: infoId.value,
+      id: infoId.value || ruleForm.value.id,
+    }).then(() => {
+      ElMessage.success('提交成功')
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存')
+  }
+}
+// 点击编辑
+const handleEdit = () => {
+  $router.push({
+    path: `/correcthandle/update/${ruleForm.value.id}`,
+    query: { ...$route.query },
+  })
+}
+const del = () => {
+  if (approvalStatusName === '草稿箱') {
+    draftDelete({ id: ruleForm.value.id }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+  else if (approvalStatusName === '已取消') {
+    approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+  else if (approvalStatusName === '全部') { // 全部的删除
+    delteQualityCorrect({ id: ruleForm.value.id }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+}
+// 关闭页面
+function close() {
+  $router.push({
+    path: '/correct/correcthandle',
+  })
+}
+const showMenu = ref('基本信息')
+defineExpose({
+  ruleForm, showMenu,
+})
+// 不符合要求情况分析报告弹窗
+const conformanceRef = ref()
+// 打开弹窗
+const selectConformance = () => {
+  conformanceRef.value.initDialog()
+}
+// 确认报告
+const confirmConformance = (report: any) => {
+  console.log(report, 'report')
+  ruleForm.value.correctiveActionFiles = report
+  ruleFormRef.value?.clearValidate('correctiveActionFiles')
+}
+// 报告详情
+const goDetail = () => {
+  const data = ruleForm.value.correctiveActionFiles[0]
+  sessionStorage.setItem('QualityCorrectHandler-info', JSON.stringify(ruleForm.value))
+  $router.push({
+    path: `/superviseanalysis/detail/${data.id}`,
+    query: {
+      approvalStatusName: '全部', // 审批状态名称
+      processId: data.processId, // 流程实例id
+      taskId: data.taskId, // 任务id
+      id: data.id,
+    },
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
-    <detail-page title="纠正措施处理单">
+    <!-- 不符合要求情况分析报告弹窗 -->
+    <non-conformance-rep ref="conformanceRef" @add="confirmConformance" />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :agree="AGREE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL" @on-success="approvalSuccess" @refuse="refuse" />
+    <detail-page title="预防措施处理单" class="info-header">
       <template #btns>
-        <el-button type="primary">
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '待审批' && showApprovalButton" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '待审批' && showApprovalButton" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '审批中' && showApprovalButton" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- :disabled="!infoId" -->
+        <el-button
+          v-if="$route.path.includes('create') || ($route.path.includes('update') && approvalStatusName !== '未通过' && approvalStatusName !== '已取消')"
+          type="primary"
+          @click="handleSubmit"
+        >
           提交
         </el-button>
-        <el-button type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="approvalStatusName !== '已审批' && $route.path.includes('detail') && approvalStatusName === '未通过'" type="primary" @click="handleEdit">
+          编辑
+        </el-button>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
-        <el-button type="info" @click="() => $router.go(-1)">
+        <el-button v-if="approvalStatusName === '已取消'" type="danger" @click="del">
+          删除
+        </el-button>
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <detail-block title="">
-      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+    <detail-page v-if="approvalStatusName !== '草稿箱' && !$route.path.includes('create')" title="" class="info-radio">
+      <el-radio-group v-model="showMenu">
+        <el-radio-button label="基本信息" />
+        <el-radio-button label="审批详情" />
+      </el-radio-group>
+    </detail-page>
+    <!-- 基本信息 -->
+    <el-form v-show="showMenu === '基本信息'" ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <detail-block title="">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="temTip">
+            <el-form-item label="实验室代码" prop="bizLabCode">
               <el-select
-                v-model="ruleForm.storageLocation"
+                v-model="ruleForm.bizLabCode"
                 placeholder="实验室代码"
                 class="short-input"
                 filterable
                 style="width: 100%;"
               >
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="责任部门" prop="temTip">
+            <el-form-item label="部门" prop="supDeptId">
               <el-select
-                v-model="ruleForm.storageLocation"
-                placeholder="责任部门"
+                v-model="ruleForm.supDeptId"
+                placeholder="部门"
                 class="short-input"
                 filterable
                 style="width: 100%;"
               >
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="文件编号" prop="temName">
-              <el-input v-model.trim="ruleForm.temName" />
+            <el-form-item label="处理单编号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="处理单名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="文件名称" prop="updateName">
-              <el-input v-model.trim="ruleForm.updateName" disabled />
+            <el-form-item label="提出人" prop="creatorName">
+              <el-input v-model.trim="ruleForm.creatorName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="提出人" prop="updateName">
-              <el-input v-model.trim="ruleForm.updateName" disabled />
+            <el-form-item label="记录时间" prop="logTime">
+              <!-- <el-input v-model.trim="ruleForm.logTime" disabled /> -->
+              <el-date-picker
+                v-model="ruleForm.logTime"
+                type="datetime"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间" prop="updateTime">
-              <!-- <el-input v-model.trim="ruleForm.time" disabled /> -->
-              <el-input v-model.trim="ruleForm.updateTime" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label-width="200px" label="关联不符合要求情况分析报告" prop="updateTime">
+            <el-form-item label-width="220px" label="关联输入文件" prop="correctiveActionFiles">
               <!-- <el-input v-model.trim="ruleForm.time" disabled /> -->
-              <el-button type="primary">
+              <el-link
+                v-if="ruleForm.correctiveActionFiles.length"
+                type="primary"
+                style="margin-right: 10px;"
+                @click="goDetail"
+              >
+                <!-- {{ ruleForm.correctiveActionFiles.length ? `${ruleForm.correctiveActionFiles[0].fileCode}-${ruleForm.correctiveActionFiles[0].fileName}` : '' }} -->
+                {{ ruleForm.correctiveActionFiles.length ? `${ruleForm.correctiveActionFiles[0].fileName}` : '' }}
+              </el-link>
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="selectConformance">
                 选择
               </el-button>
-              <el-button type="primary">
-                上传
-              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-    </detail-block>
-    <detail-block title="">
-      <el-form :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <el-form-item label-width="200px" label="存在不符合要求事实陈述" prop="conferenceTime" />
-          </el-col>
-        </el-row>
+      </detail-block>
+      <detail-block title="">
         <el-row :gutter="24" class="marg">
           <el-col :span="22">
-            <el-form-item label-width="200px" label="" prop="conferenceTime">
-              <el-input v-model.trim="ruleForm.conferenceTime" placeholder="存在不符合要求事实陈述" :rows="3" type="textarea" />
+            <el-form-item label-width="200px" label="存在不符合要求事实陈述" prop="description">
+              <el-input v-model.trim="ruleForm.description" placeholder="存在不符合要求事实陈述" :rows="3" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-    </detail-block>
+      </detail-block>
+    </el-form>
+    <!-- 审批详情 -->
+    <approval-record-table v-if="showMenu === '审批详情'" :process-id="processId" />
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
+.info-radio {
+  ::v-deep(.header) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/quality/correct/handle/index.vue b/src/views/quality/correct/handle/index.vue
index 65b7e65..57c46d8 100644
--- a/src/views/quality/correct/handle/index.vue
+++ b/src/views/quality/correct/handle/index.vue
@@ -1,24 +1,39 @@
 <!-- 纠正措施处理单列表 -->
-<script name="QualityCorret" lang="ts" setup>
+<script name="QualityCorrect" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { approvalDelete, cancelApproval, delteQualityCorrect, draftDelete, getQualityCorrectList, refuseApproval, submitQualityCorrect } from '@/api/quality/correct/index'
+import { getSearchDept } from '@/api/quality/supervise/record'
+import { AGREE } from '@/views/quality/agree'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import filePreview from '@/views/quality/supervise/record/components/filePreviewSingle.vue'
+import ApprovalDialog from '@/components/ApprovalCustom/ApprovalDialog.vue'
+const approvalDialog = ref() // 审批对话ref
+const active = ref<string>('全部')
 // 查询条件
 const listQuery = ref({
-  startTime: '',
-  endTime: '',
-  checked: false,
+  approvalStatus: active.value,
+  fileCode: '',
+  bizLabCode: '',
+  supDeptId: '',
+  creatorName: '',
+  sourceType: '',
+  subTimeStart: '',
+  subTimeEnd: '',
   offset: 1,
   limit: 20,
+  formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL,
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value.subTimeStart = ''
+  listQuery.value.subTimeEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+      listQuery.value.subTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.value.subTimeEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
@@ -29,14 +44,13 @@
 const checkoutList = ref<string[]>([])// 选中的内容
 // 列
 const columns = ref<TableColumn[]>([
-  { text: '文件编号', value: 'standardNo', align: 'center' },
-  { text: '文件名称', value: 'standardNo', align: 'center' },
-  { text: '实验室', value: 'standardNo', align: 'center' },
-  { text: '责任部门', value: 'standardNo', align: 'center' },
-  { text: '提出人', value: 'standardNo', align: 'center' },
-  { text: '提出时间', value: 'standardNo', align: 'center' },
-  { text: '输入来源', value: 'standardNo', align: 'center' },
-  { text: '关联输入文件', value: 'standardNo', align: 'center' },
+  { text: '处理单编号', value: 'fileCode', align: 'center' },
+  { text: '处理单名称', value: 'fileName', align: 'center' },
+  { text: '实验室', value: 'bizLabCodeName', align: 'center' },
+  { text: '责任部门', value: 'deptName', align: 'center' },
+  { text: '提出人', value: 'creatorName', align: 'center' },
+  { text: '提出时间', value: 'subTime', align: 'center' },
+  { text: '输入来源', value: 'sourceTypeName', align: 'center' },
 ])
 // 数据查询
 function fetchData(isNowPage = false) {
@@ -45,21 +59,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  tableList.value = []
-  total.value = 0
-  loadingTable.value = false
-  // getStandardList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows.map((item: { lastReviewDate: string; agreementAmount: number }) => {
-  //     return {
-  //       ...item,
-  //       lastReviewDate: item.lastReviewDate ? dayjs(item.lastReviewDate).format('YYYY-MM-DD') : item.lastReviewDate, // 最近复查日期
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  getQualityCorrectList({ ...listQuery.value, formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL }).then((response) => {
+    tableList.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -70,12 +76,19 @@
 const clearList = () => {
   datetimerange.value = []
   listQuery.value = {
-    startTime: '',
-    endTime: '',
-    checked: false,
+    approvalStatus: active.value,
+    fileCode: '',
+    bizLabCode: '',
+    supDeptId: '',
+    creatorName: '',
+    sourceType: '',
+    subTimeStart: '',
+    subTimeEnd: '',
     offset: 1,
     limit: 20,
+    formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL,
   }
+  fetchData(true)
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -95,8 +108,10 @@
 // 右上角菜单
 const buttonBoxActive = 'QualityCorrect'
 const menu = ref<any[]>([])
-const active = ref<string>('全部')
 // 查询字典
+const labelList = ref<{ id: string; value: string; name: string }[]>()// 实验室代码
+const deptList = ref<{ deptName: string; deptId: string }[]>([]) // 部门列表
+const sourceTypeList = ref<{ id: string; value: string; name: string }[]>([]) // 输入来源
 const getDict = async () => {
   // loadingTable.value = true
   // 审批状态
@@ -110,10 +125,31 @@
         name: tempFindData.name,
         id: `${tempFindData.value}`,
       })
-      // active.value = tempFindData
     }
   })
+  // 获取实验室代码字典
+  getDictByCode('bizLabCode').then((res) => {
+    labelList.value = res.data
+  })
+  // 输入来源
+  getDictByCode('quality_source_type').then((res) => {
+    sourceTypeList.value = res.data
+  })
+  //  部门列表
+  getSearchDept({ labCode: '' }).then((res) => {
+    deptList.value = res.data
+  })
 }
+watch(() => listQuery.value.bizLabCode, (newVal) => {
+  if (newVal) {
+    listQuery.value.supDeptId = ''
+    getSearchDept({ labCode: newVal }).then((res) => {
+      deptList.value = res.data
+    })
+  }
+}, {
+  deep: true,
+})
 const changeCurrentButton = (val: string) => {
   active.value = val
   window.sessionStorage.setItem(buttonBoxActive, val)
@@ -126,6 +162,106 @@
     path: `/correcthandle/${type}`,
   })
 }
+const handleEdit = (row: any, type: string) => {
+  if (type === 'update' || type === 'detail' || type === 'create') { // 编辑、详情
+    $router.push({
+      path: `/correcthandle/${type}/${row.id}`,
+      query: {
+        approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+        processId: row.processId, // 流程实例id
+        taskId: row.taskId, // 任务id
+        id: row.id,
+      },
+    })
+  }
+  else if (type === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (type === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+  }
+  else if (type === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+      id: row.id,
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已取消',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else {
+    ElMessageBox.confirm(
+      `确认${type}吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      if (type === '删除' && row.approvalStatusName === '草稿箱') {
+        draftDelete({ id: row.id }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+      else if (type === '删除' && row.approvalStatusName === '已取消') {
+        approvalDelete({ id: row.id, taskId: row.taskId }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+      else if (type === '删除' && active.value === '0') { // 全部的删除
+        // delRef.value.initDialog(row)
+        delteQualityCorrect({ id: row.id }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+      else if (type === '提交' && active.value === '1') {
+        submitQualityCorrect({ id: row.id, formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 拒绝
+const refuse = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
+    ElMessage({
+      type: 'success',
+      message: '已拒绝',
+    })
+    fetchData(true)
+  })
+}
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(buttonBoxActive)) {
@@ -134,7 +270,6 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
-  searchList()
 })
 </script>
 
@@ -142,50 +277,49 @@
   <app-container>
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :agree="AGREE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL" @on-success="approvalSuccess" @refuse="refuse" />
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model="listQuery.storageLocation"
+          v-model="listQuery.fileCode"
           placeholder="处理单编号"
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.storageLocation"
-          placeholder="实验室代码"
+          v-model="listQuery.bizLabCode"
+          placeholder="实验室"
           class="short-input"
           filterable
-          style="width: 100%;"
         >
-          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.storageLocation"
-          placeholder="责任部门"
+          v-model="listQuery.supDeptId"
+          placeholder="部门"
           class="short-input"
           filterable
-          style="width: 100%;"
         >
-          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model="listQuery.storageLocation"
+          v-model="listQuery.creatorName"
           placeholder="提出人"
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.storageLocation"
+          v-model="listQuery.sourceType"
           placeholder="输入来源"
           class="short-input"
           filterable
-          style="width: 100%;"
         >
-          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item in sourceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
@@ -214,12 +348,24 @@
         </template>
         <template #columns>
           <el-table-column
+            label="关联输入文件"
+            align="center"
+          >
+            <template #default="{ row }">
+              <div class="container">
+                <div v-for="(item, index) in row.correctiveActionFiles || []" :key="item.id" :class="`${index === 0 ? '' : 'item'}`">
+                  <file-preview :minio-file-name="item.fileName" :minio-file-path="item.filePath || ''" />
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
             v-if="active !== '0'"
             label="审批状况"
             align="center"
           >
             <template #default="{ row }">
-              {{ row }}
+              {{ row.approvalStatusName }}
             </template>
           </el-table-column>
           <el-table-column
@@ -229,24 +375,76 @@
           >
             <template #default="{ row }">
               <el-button
+                v-if="active === '1'"
                 size="small"
                 type="primary"
                 link
+                @click="handleEdit(row, '提交')"
               >
-                详情 {{ row }}
+                提交
               </el-button>
               <el-button
+                v-if="active !== '1' && active !== '6' && active !== '5'"
                 size="small"
                 type="primary"
                 link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" active === '1' || active === '6' || active === '5'"
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'update')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="row.approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="row.approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="active === '0'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'update')"
               >
                 编辑
               </el-button>
+
+              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="active === '1'"
+                v-if="row.approvalStatusName === '审批中' && active !== '7' && active !== '0'"
                 size="small"
-                type="danger"
                 link
+                type="info"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="active !== '7' && (active === '0' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')"
+                size="small"
+                link
+                type="danger"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -258,3 +456,17 @@
   </app-container>
 </template>
 
+<style lang="scss" scope>
+.container {
+  // display: flex;
+  width: 100%;
+
+  .item {
+    float: left;
+    border-top: 1px solid #ebeef5;
+    text-align: center;
+    width: 100%;
+  }
+}
+</style>
+

diff --git a/src/api/quality/correct/index.ts b/src/api/quality/correct/index.ts
new file mode 100644
index 0000000..a612bb8
--- /dev/null
+++ b/src/api/quality/correct/index.ts
@@ -0,0 +1,87 @@
+/**
+ * 纠正措施处理单相关接口
+ */
+import request from '../../index'
+
+// 纠正措施处理单列表查询-分页
+export function getQualityCorrectList(data: any) {
+  return request({
+    url: `/quality/bizQualityCorrectiveRecord/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 取消审批
+export function cancelApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除-草稿箱
+export function draftDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/draftDelete',
+    method: 'post',
+    data,
+  })
+}
+// 删除 -已取消
+export function approvalDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delteQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/delete',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/submit',
+    method: 'post',
+    data,
+  })
+}
+// 审批 -拒绝
+export function refuseApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/refuse',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/detail',
+    method: 'get',
+    params: data,
+  })
+}
+// 新建
+export function addQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/add',
+    method: 'post',
+    data,
+  })
+}
+// 更新
+export function updateQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/quality.ts b/src/router/modules/quality.ts
index 95a8670..00c5831 100644
--- a/src/router/modules/quality.ts
+++ b/src/router/modules/quality.ts
@@ -492,7 +492,7 @@
         },
       },
       {
-        path: '/correcthandle/:type',
+        path: '/correcthandle/:type/:id?',
         name: 'CorrectHandleEdit',
         component: () => import('@/views/quality/correct/handle/components/edit.vue'),
         meta: {
diff --git a/src/views/quality/agree.ts b/src/views/quality/agree.ts
index e619ac3..6dc06cc 100644
--- a/src/views/quality/agree.ts
+++ b/src/views/quality/agree.ts
@@ -3,4 +3,5 @@
   QUALITY_SUPERVISION_RECORD_APPROVAL = '/quality/bizQualitySupervisionRep/agree', // 质量监督报告
   NONCONFORMITY_ANALYSIS_APPROVAL = '/quality/bizQualityNonConformanceRep/agree', // 不符合要求情况分析报告
   PREVENT_MEASURE_PROCESS_SHEET_APPROVAL = '/quality/bizQualityPreventRecord/agree', // 预防措施处理单
+  CORRECT_MEASURE_PROCESS_SHEET_APPROVAL = '/quality/bizQualityCorrectiveRecord/agree', // 纠正措施处理单
 }
diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue
index 7e9772c..ad606b0 100644
--- a/src/views/quality/correct/handle/components/edit.vue
+++ b/src/views/quality/correct/handle/components/edit.vue
@@ -1,154 +1,430 @@
 <!-- 纠正措施处理单编辑页面 -->
-<script name="QualityPreventHandler" lang="ts" setup>
+<script name="QualityCorrectHandler" lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import NonConformanceRep from '@/views/quality/prevent/handle/components/NonConformanceRep.vue'
+import { addQualityCorrect, approvalDelete, cancelApproval, delteQualityCorrect, detailQualityCorrect, draftDelete, refuseApproval, submitQualityCorrect, updateQualityCorrect } from '@/api/quality/correct/index'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
+import { getSearchDept } from '@/api/quality/supervise/record'
+import { AGREE } from '@/views/quality/agree'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ApprovalDialog from '@/components/ApprovalCustom/ApprovalDialog.vue'
+// 路由相关
 const $route = useRoute()
 const $router = useRouter()
+// 用户信息仓库
 const userStore = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
-const dialogStatus = ref('create')
+// 当前审批状态名字
+const approvalStatusName = $route.query.approvalStatusName as string
+// 表单
 const ruleForm = ref({
-  createTime: '',
+  fileName: '预防措施处理单',
+  bizLabCode: '',
+  supDeptId: '',
+  fileCode: '',
+  creator: '',
+  creatorName: '',
+  logTime: '',
   id: '',
-  temName: '',
-  temTip: '',
-  updateId: '',
-  updateName: '',
-  updateTime: '',
-}) // 表单
-const rules = ref<FormRules>({
-  temName: [{ required: true, message: '模板名称必填', trigger: ['blur', 'change'] }],
-}) // 表单验证规则
-// 模板管理内容列表
-onMounted(() => {
-  // const data = JSON.parse($route.query.row as string)
-  // ruleForm.value = data
-
-  // // 获取当前用户信息
-  // ruleForm.value.updateTime = dayjs().format('YYYY-MM-DD HH:mm') // 创建时间
-  // ruleForm.value.updateId = userStore.id
-  // ruleForm.value.updateName = userStore.name
+  correctiveActionFiles: [] as any[],
+  description: '',
+  taskId: '',
 })
-// 保存
+// 表单验证规则
+const rules = ref<FormRules>({
+  bizLabCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
+  correctiveActionFiles: [{ required: true, message: '关联输入文件必选', trigger: ['blur', 'change'] }],
+  supDeptId: [{ required: true, message: '部门必选', trigger: ['blur', 'change'] }],
+})
+// 填充数据
+const fillData = () => {
+  if (sessionStorage.getItem('QualityCorrectHandler-info-flag')) {
+    ruleForm.value = JSON.parse(sessionStorage.getItem('QualityCorrectHandler-info') as string)
+    // 清空存储
+    sessionStorage.removeItem('QualityCorrectHandler-info-flag')
+    sessionStorage.removeItem('QualityCorrectHandler-info')
+    return false
+  }
+}
+
+const labelList = ref<{ id: string; value: string; name: string }[]>()// 实验室代码
+const deptList = ref<any[]>()// 部门
+// 获取字典值
+const fetchDict = () => {
+// 获取实验室代码字典
+  getDictByCode('bizLabCode').then((res) => {
+    labelList.value = res.data
+  })
+  // 部门
+  getSearchDept({ labCode: '' }).then((res) => {
+    deptList.value = res.data
+  })
+}
+fetchDict()
+// 监听实验室变化修改部门
+const watchFlag = ref(true)
+watch(() => ruleForm.value.bizLabCode, (newVal) => {
+  if (newVal) {
+    if ($route.path.includes('detail') || watchFlag.value) { return }
+    ruleForm.value.supDeptId = ''
+    getSearchDept({ labCode: newVal }).then((res) => {
+      deptList.value = res.data
+    })
+  }
+}, {
+  deep: true,
+})
+// 页面初始化
+onMounted(() => {
+  if ($route.path.includes('create')) {
+    watchFlag.value = false
+    // 默认填充信息
+    fillData()
+    ruleForm.value.creator = userStore.id
+    ruleForm.value.creatorName = userStore.name
+    ruleForm.value.logTime = dayjs().format('YYYY-MM-DD HH:mm')
+    // 自动关联不符合报告(启动纠正措施管理)
+    if ($route.params.id) {
+      ruleForm.value.correctiveActionFiles = [{ ...JSON.parse($route.query.row as string), fileType: '1' }]
+    }
+  }
+  else {
+    fillData()
+    detailQualityCorrect({ id: $route.params.id as string }).then((res) => {
+      // 详情
+      // console.log(res.data, '详情')
+      ruleForm.value = res.data
+      setTimeout(() => {
+        watchFlag.value = false
+      }, 500)
+    })
+  }
+})
+// ---------------------------------------------保存相关--------------------------------------
+const infoId = ref('')
+const createRow = () => {
+  addQualityCorrect(ruleForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    infoId.value = res.data
+  })
+}
+const updateRow = () => {
+  updateQualityCorrect(ruleForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    infoId.value = res.data
+    if (approvalStatusName === '已取消' || approvalStatusName === '未通过') {
+      handleSubmit()
+    }
+  })
+}
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-      })
+      if ($route.path.includes('create')) {
+        createRow()
+      }
+      else if ($route.path.includes('update')) {
+        updateRow()
+      }
     }
   })
 }
+// ---------------------------------------------审批--------------------------------------
+const taskId = ref($route.query.taskId as string || '') // 任务id，用于同意、驳回、拒绝审批
+const processId = ref($route.query.processId as string || '') // 流程实例id
+const approvalDialog = ref() // 审批组件ref
+const showApprovalButton = ref(true) // 是否展示审批按钮
+// 审批结束回调
+const approvalSuccess = () => {
+  showApprovalButton.value = false
+}
+// 审批
+const handleApprove = (val: string) => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+      id: ruleForm.value.id,
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已取消',
+          })
+          showApprovalButton.value = false
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value, ruleForm.value.id)
+  }
+}
+// 拒绝
+const refuse = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
+    ElMessage({
+      type: 'success',
+      message: '已拒绝',
+    })
+    showApprovalButton.value = false
+  })
+}
+// 点击提交
+function handleSubmit() {
+  if (infoId.value || ruleForm.value.id) {
+    submitQualityCorrect({
+      formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL,
+      // processId: infoId.value,
+      id: infoId.value || ruleForm.value.id,
+    }).then(() => {
+      ElMessage.success('提交成功')
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存')
+  }
+}
+// 点击编辑
+const handleEdit = () => {
+  $router.push({
+    path: `/correcthandle/update/${ruleForm.value.id}`,
+    query: { ...$route.query },
+  })
+}
+const del = () => {
+  if (approvalStatusName === '草稿箱') {
+    draftDelete({ id: ruleForm.value.id }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+  else if (approvalStatusName === '已取消') {
+    approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+  else if (approvalStatusName === '全部') { // 全部的删除
+    delteQualityCorrect({ id: ruleForm.value.id }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+}
+// 关闭页面
+function close() {
+  $router.push({
+    path: '/correct/correcthandle',
+  })
+}
+const showMenu = ref('基本信息')
+defineExpose({
+  ruleForm, showMenu,
+})
+// 不符合要求情况分析报告弹窗
+const conformanceRef = ref()
+// 打开弹窗
+const selectConformance = () => {
+  conformanceRef.value.initDialog()
+}
+// 确认报告
+const confirmConformance = (report: any) => {
+  console.log(report, 'report')
+  ruleForm.value.correctiveActionFiles = report
+  ruleFormRef.value?.clearValidate('correctiveActionFiles')
+}
+// 报告详情
+const goDetail = () => {
+  const data = ruleForm.value.correctiveActionFiles[0]
+  sessionStorage.setItem('QualityCorrectHandler-info', JSON.stringify(ruleForm.value))
+  $router.push({
+    path: `/superviseanalysis/detail/${data.id}`,
+    query: {
+      approvalStatusName: '全部', // 审批状态名称
+      processId: data.processId, // 流程实例id
+      taskId: data.taskId, // 任务id
+      id: data.id,
+    },
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
-    <detail-page title="纠正措施处理单">
+    <!-- 不符合要求情况分析报告弹窗 -->
+    <non-conformance-rep ref="conformanceRef" @add="confirmConformance" />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :agree="AGREE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL" @on-success="approvalSuccess" @refuse="refuse" />
+    <detail-page title="预防措施处理单" class="info-header">
       <template #btns>
-        <el-button type="primary">
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '待审批' && showApprovalButton" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '待审批' && showApprovalButton" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '审批中' && showApprovalButton" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- :disabled="!infoId" -->
+        <el-button
+          v-if="$route.path.includes('create') || ($route.path.includes('update') && approvalStatusName !== '未通过' && approvalStatusName !== '已取消')"
+          type="primary"
+          @click="handleSubmit"
+        >
           提交
         </el-button>
-        <el-button type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="approvalStatusName !== '已审批' && $route.path.includes('detail') && approvalStatusName === '未通过'" type="primary" @click="handleEdit">
+          编辑
+        </el-button>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
-        <el-button type="info" @click="() => $router.go(-1)">
+        <el-button v-if="approvalStatusName === '已取消'" type="danger" @click="del">
+          删除
+        </el-button>
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <detail-block title="">
-      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+    <detail-page v-if="approvalStatusName !== '草稿箱' && !$route.path.includes('create')" title="" class="info-radio">
+      <el-radio-group v-model="showMenu">
+        <el-radio-button label="基本信息" />
+        <el-radio-button label="审批详情" />
+      </el-radio-group>
+    </detail-page>
+    <!-- 基本信息 -->
+    <el-form v-show="showMenu === '基本信息'" ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <detail-block title="">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="temTip">
+            <el-form-item label="实验室代码" prop="bizLabCode">
               <el-select
-                v-model="ruleForm.storageLocation"
+                v-model="ruleForm.bizLabCode"
                 placeholder="实验室代码"
                 class="short-input"
                 filterable
                 style="width: 100%;"
               >
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="责任部门" prop="temTip">
+            <el-form-item label="部门" prop="supDeptId">
               <el-select
-                v-model="ruleForm.storageLocation"
-                placeholder="责任部门"
+                v-model="ruleForm.supDeptId"
+                placeholder="部门"
                 class="short-input"
                 filterable
                 style="width: 100%;"
               >
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="文件编号" prop="temName">
-              <el-input v-model.trim="ruleForm.temName" />
+            <el-form-item label="处理单编号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="处理单名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="文件名称" prop="updateName">
-              <el-input v-model.trim="ruleForm.updateName" disabled />
+            <el-form-item label="提出人" prop="creatorName">
+              <el-input v-model.trim="ruleForm.creatorName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="提出人" prop="updateName">
-              <el-input v-model.trim="ruleForm.updateName" disabled />
+            <el-form-item label="记录时间" prop="logTime">
+              <!-- <el-input v-model.trim="ruleForm.logTime" disabled /> -->
+              <el-date-picker
+                v-model="ruleForm.logTime"
+                type="datetime"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间" prop="updateTime">
-              <!-- <el-input v-model.trim="ruleForm.time" disabled /> -->
-              <el-input v-model.trim="ruleForm.updateTime" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label-width="200px" label="关联不符合要求情况分析报告" prop="updateTime">
+            <el-form-item label-width="220px" label="关联输入文件" prop="correctiveActionFiles">
               <!-- <el-input v-model.trim="ruleForm.time" disabled /> -->
-              <el-button type="primary">
+              <el-link
+                v-if="ruleForm.correctiveActionFiles.length"
+                type="primary"
+                style="margin-right: 10px;"
+                @click="goDetail"
+              >
+                <!-- {{ ruleForm.correctiveActionFiles.length ? `${ruleForm.correctiveActionFiles[0].fileCode}-${ruleForm.correctiveActionFiles[0].fileName}` : '' }} -->
+                {{ ruleForm.correctiveActionFiles.length ? `${ruleForm.correctiveActionFiles[0].fileName}` : '' }}
+              </el-link>
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="selectConformance">
                 选择
               </el-button>
-              <el-button type="primary">
-                上传
-              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-    </detail-block>
-    <detail-block title="">
-      <el-form :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <el-form-item label-width="200px" label="存在不符合要求事实陈述" prop="conferenceTime" />
-          </el-col>
-        </el-row>
+      </detail-block>
+      <detail-block title="">
         <el-row :gutter="24" class="marg">
           <el-col :span="22">
-            <el-form-item label-width="200px" label="" prop="conferenceTime">
-              <el-input v-model.trim="ruleForm.conferenceTime" placeholder="存在不符合要求事实陈述" :rows="3" type="textarea" />
+            <el-form-item label-width="200px" label="存在不符合要求事实陈述" prop="description">
+              <el-input v-model.trim="ruleForm.description" placeholder="存在不符合要求事实陈述" :rows="3" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-    </detail-block>
+      </detail-block>
+    </el-form>
+    <!-- 审批详情 -->
+    <approval-record-table v-if="showMenu === '审批详情'" :process-id="processId" />
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
+.info-radio {
+  ::v-deep(.header) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/quality/correct/handle/index.vue b/src/views/quality/correct/handle/index.vue
index 65b7e65..57c46d8 100644
--- a/src/views/quality/correct/handle/index.vue
+++ b/src/views/quality/correct/handle/index.vue
@@ -1,24 +1,39 @@
 <!-- 纠正措施处理单列表 -->
-<script name="QualityCorret" lang="ts" setup>
+<script name="QualityCorrect" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { approvalDelete, cancelApproval, delteQualityCorrect, draftDelete, getQualityCorrectList, refuseApproval, submitQualityCorrect } from '@/api/quality/correct/index'
+import { getSearchDept } from '@/api/quality/supervise/record'
+import { AGREE } from '@/views/quality/agree'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import filePreview from '@/views/quality/supervise/record/components/filePreviewSingle.vue'
+import ApprovalDialog from '@/components/ApprovalCustom/ApprovalDialog.vue'
+const approvalDialog = ref() // 审批对话ref
+const active = ref<string>('全部')
 // 查询条件
 const listQuery = ref({
-  startTime: '',
-  endTime: '',
-  checked: false,
+  approvalStatus: active.value,
+  fileCode: '',
+  bizLabCode: '',
+  supDeptId: '',
+  creatorName: '',
+  sourceType: '',
+  subTimeStart: '',
+  subTimeEnd: '',
   offset: 1,
   limit: 20,
+  formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL,
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value.subTimeStart = ''
+  listQuery.value.subTimeEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+      listQuery.value.subTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.value.subTimeEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
@@ -29,14 +44,13 @@
 const checkoutList = ref<string[]>([])// 选中的内容
 // 列
 const columns = ref<TableColumn[]>([
-  { text: '文件编号', value: 'standardNo', align: 'center' },
-  { text: '文件名称', value: 'standardNo', align: 'center' },
-  { text: '实验室', value: 'standardNo', align: 'center' },
-  { text: '责任部门', value: 'standardNo', align: 'center' },
-  { text: '提出人', value: 'standardNo', align: 'center' },
-  { text: '提出时间', value: 'standardNo', align: 'center' },
-  { text: '输入来源', value: 'standardNo', align: 'center' },
-  { text: '关联输入文件', value: 'standardNo', align: 'center' },
+  { text: '处理单编号', value: 'fileCode', align: 'center' },
+  { text: '处理单名称', value: 'fileName', align: 'center' },
+  { text: '实验室', value: 'bizLabCodeName', align: 'center' },
+  { text: '责任部门', value: 'deptName', align: 'center' },
+  { text: '提出人', value: 'creatorName', align: 'center' },
+  { text: '提出时间', value: 'subTime', align: 'center' },
+  { text: '输入来源', value: 'sourceTypeName', align: 'center' },
 ])
 // 数据查询
 function fetchData(isNowPage = false) {
@@ -45,21 +59,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  tableList.value = []
-  total.value = 0
-  loadingTable.value = false
-  // getStandardList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows.map((item: { lastReviewDate: string; agreementAmount: number }) => {
-  //     return {
-  //       ...item,
-  //       lastReviewDate: item.lastReviewDate ? dayjs(item.lastReviewDate).format('YYYY-MM-DD') : item.lastReviewDate, // 最近复查日期
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  getQualityCorrectList({ ...listQuery.value, formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL }).then((response) => {
+    tableList.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -70,12 +76,19 @@
 const clearList = () => {
   datetimerange.value = []
   listQuery.value = {
-    startTime: '',
-    endTime: '',
-    checked: false,
+    approvalStatus: active.value,
+    fileCode: '',
+    bizLabCode: '',
+    supDeptId: '',
+    creatorName: '',
+    sourceType: '',
+    subTimeStart: '',
+    subTimeEnd: '',
     offset: 1,
     limit: 20,
+    formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL,
   }
+  fetchData(true)
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -95,8 +108,10 @@
 // 右上角菜单
 const buttonBoxActive = 'QualityCorrect'
 const menu = ref<any[]>([])
-const active = ref<string>('全部')
 // 查询字典
+const labelList = ref<{ id: string; value: string; name: string }[]>()// 实验室代码
+const deptList = ref<{ deptName: string; deptId: string }[]>([]) // 部门列表
+const sourceTypeList = ref<{ id: string; value: string; name: string }[]>([]) // 输入来源
 const getDict = async () => {
   // loadingTable.value = true
   // 审批状态
@@ -110,10 +125,31 @@
         name: tempFindData.name,
         id: `${tempFindData.value}`,
       })
-      // active.value = tempFindData
     }
   })
+  // 获取实验室代码字典
+  getDictByCode('bizLabCode').then((res) => {
+    labelList.value = res.data
+  })
+  // 输入来源
+  getDictByCode('quality_source_type').then((res) => {
+    sourceTypeList.value = res.data
+  })
+  //  部门列表
+  getSearchDept({ labCode: '' }).then((res) => {
+    deptList.value = res.data
+  })
 }
+watch(() => listQuery.value.bizLabCode, (newVal) => {
+  if (newVal) {
+    listQuery.value.supDeptId = ''
+    getSearchDept({ labCode: newVal }).then((res) => {
+      deptList.value = res.data
+    })
+  }
+}, {
+  deep: true,
+})
 const changeCurrentButton = (val: string) => {
   active.value = val
   window.sessionStorage.setItem(buttonBoxActive, val)
@@ -126,6 +162,106 @@
     path: `/correcthandle/${type}`,
   })
 }
+const handleEdit = (row: any, type: string) => {
+  if (type === 'update' || type === 'detail' || type === 'create') { // 编辑、详情
+    $router.push({
+      path: `/correcthandle/${type}/${row.id}`,
+      query: {
+        approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+        processId: row.processId, // 流程实例id
+        taskId: row.taskId, // 任务id
+        id: row.id,
+      },
+    })
+  }
+  else if (type === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (type === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+  }
+  else if (type === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+      id: row.id,
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已取消',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else {
+    ElMessageBox.confirm(
+      `确认${type}吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      if (type === '删除' && row.approvalStatusName === '草稿箱') {
+        draftDelete({ id: row.id }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+      else if (type === '删除' && row.approvalStatusName === '已取消') {
+        approvalDelete({ id: row.id, taskId: row.taskId }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+      else if (type === '删除' && active.value === '0') { // 全部的删除
+        // delRef.value.initDialog(row)
+        delteQualityCorrect({ id: row.id }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+      else if (type === '提交' && active.value === '1') {
+        submitQualityCorrect({ id: row.id, formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 拒绝
+const refuse = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
+    ElMessage({
+      type: 'success',
+      message: '已拒绝',
+    })
+    fetchData(true)
+  })
+}
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(buttonBoxActive)) {
@@ -134,7 +270,6 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
-  searchList()
 })
 </script>
 
@@ -142,50 +277,49 @@
   <app-container>
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :agree="AGREE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL" @on-success="approvalSuccess" @refuse="refuse" />
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model="listQuery.storageLocation"
+          v-model="listQuery.fileCode"
           placeholder="处理单编号"
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.storageLocation"
-          placeholder="实验室代码"
+          v-model="listQuery.bizLabCode"
+          placeholder="实验室"
           class="short-input"
           filterable
-          style="width: 100%;"
         >
-          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.storageLocation"
-          placeholder="责任部门"
+          v-model="listQuery.supDeptId"
+          placeholder="部门"
           class="short-input"
           filterable
-          style="width: 100%;"
         >
-          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model="listQuery.storageLocation"
+          v-model="listQuery.creatorName"
           placeholder="提出人"
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.storageLocation"
+          v-model="listQuery.sourceType"
           placeholder="输入来源"
           class="short-input"
           filterable
-          style="width: 100%;"
         >
-          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item in sourceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
@@ -214,12 +348,24 @@
         </template>
         <template #columns>
           <el-table-column
+            label="关联输入文件"
+            align="center"
+          >
+            <template #default="{ row }">
+              <div class="container">
+                <div v-for="(item, index) in row.correctiveActionFiles || []" :key="item.id" :class="`${index === 0 ? '' : 'item'}`">
+                  <file-preview :minio-file-name="item.fileName" :minio-file-path="item.filePath || ''" />
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
             v-if="active !== '0'"
             label="审批状况"
             align="center"
           >
             <template #default="{ row }">
-              {{ row }}
+              {{ row.approvalStatusName }}
             </template>
           </el-table-column>
           <el-table-column
@@ -229,24 +375,76 @@
           >
             <template #default="{ row }">
               <el-button
+                v-if="active === '1'"
                 size="small"
                 type="primary"
                 link
+                @click="handleEdit(row, '提交')"
               >
-                详情 {{ row }}
+                提交
               </el-button>
               <el-button
+                v-if="active !== '1' && active !== '6' && active !== '5'"
                 size="small"
                 type="primary"
                 link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" active === '1' || active === '6' || active === '5'"
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'update')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="row.approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="row.approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="active === '0'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'update')"
               >
                 编辑
               </el-button>
+
+              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="active === '1'"
+                v-if="row.approvalStatusName === '审批中' && active !== '7' && active !== '0'"
                 size="small"
-                type="danger"
                 link
+                type="info"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="active !== '7' && (active === '0' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')"
+                size="small"
+                link
+                type="danger"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -258,3 +456,17 @@
   </app-container>
 </template>
 
+<style lang="scss" scope>
+.container {
+  // display: flex;
+  width: 100%;
+
+  .item {
+    float: left;
+    border-top: 1px solid #ebeef5;
+    text-align: center;
+    width: 100%;
+  }
+}
+</style>
+
diff --git a/src/views/quality/prevent/handle/index.vue b/src/views/quality/prevent/handle/index.vue
index fc4a9d5..fb18676 100644
--- a/src/views/quality/prevent/handle/index.vue
+++ b/src/views/quality/prevent/handle/index.vue
@@ -348,7 +348,7 @@
         </template>
         <template #columns>
           <el-table-column
-            label="关联输入文件"
+            label="关联不符合要求情况分析报告"
             align="center"
           >
             <template #default="{ row }">

diff --git a/src/api/quality/correct/index.ts b/src/api/quality/correct/index.ts
new file mode 100644
index 0000000..a612bb8
--- /dev/null
+++ b/src/api/quality/correct/index.ts
@@ -0,0 +1,87 @@
+/**
+ * 纠正措施处理单相关接口
+ */
+import request from '../../index'
+
+// 纠正措施处理单列表查询-分页
+export function getQualityCorrectList(data: any) {
+  return request({
+    url: `/quality/bizQualityCorrectiveRecord/approval/listPage?offset=${data.offset}&limit=${data.limit}`,
+    method: 'post',
+    data,
+  })
+}
+// 取消审批
+export function cancelApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/revoke',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除-草稿箱
+export function draftDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/draftDelete',
+    method: 'post',
+    data,
+  })
+}
+// 删除 -已取消
+export function approvalDelete(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/delete',
+    method: 'post',
+    data,
+  })
+}
+
+// 删除
+export function delteQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/delete',
+    method: 'post',
+    data,
+  })
+}
+// 提交
+export function submitQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/submit',
+    method: 'post',
+    data,
+  })
+}
+// 审批 -拒绝
+export function refuseApproval(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/approval/refuse',
+    method: 'post',
+    data,
+  })
+}
+// 详情
+export function detailQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/detail',
+    method: 'get',
+    params: data,
+  })
+}
+// 新建
+export function addQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/add',
+    method: 'post',
+    data,
+  })
+}
+// 更新
+export function updateQualityCorrect(data: any) {
+  return request({
+    url: '/quality/bizQualityCorrectiveRecord/update',
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/router/modules/quality.ts b/src/router/modules/quality.ts
index 95a8670..00c5831 100644
--- a/src/router/modules/quality.ts
+++ b/src/router/modules/quality.ts
@@ -492,7 +492,7 @@
         },
       },
       {
-        path: '/correcthandle/:type',
+        path: '/correcthandle/:type/:id?',
         name: 'CorrectHandleEdit',
         component: () => import('@/views/quality/correct/handle/components/edit.vue'),
         meta: {
diff --git a/src/views/quality/agree.ts b/src/views/quality/agree.ts
index e619ac3..6dc06cc 100644
--- a/src/views/quality/agree.ts
+++ b/src/views/quality/agree.ts
@@ -3,4 +3,5 @@
   QUALITY_SUPERVISION_RECORD_APPROVAL = '/quality/bizQualitySupervisionRep/agree', // 质量监督报告
   NONCONFORMITY_ANALYSIS_APPROVAL = '/quality/bizQualityNonConformanceRep/agree', // 不符合要求情况分析报告
   PREVENT_MEASURE_PROCESS_SHEET_APPROVAL = '/quality/bizQualityPreventRecord/agree', // 预防措施处理单
+  CORRECT_MEASURE_PROCESS_SHEET_APPROVAL = '/quality/bizQualityCorrectiveRecord/agree', // 纠正措施处理单
 }
diff --git a/src/views/quality/correct/handle/components/edit.vue b/src/views/quality/correct/handle/components/edit.vue
index 7e9772c..ad606b0 100644
--- a/src/views/quality/correct/handle/components/edit.vue
+++ b/src/views/quality/correct/handle/components/edit.vue
@@ -1,154 +1,430 @@
 <!-- 纠正措施处理单编辑页面 -->
-<script name="QualityPreventHandler" lang="ts" setup>
+<script name="QualityCorrectHandler" lang="ts" setup>
 import type { FormInstance, FormRules, UploadUserFile } from 'element-plus'
 import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import dayjs from 'dayjs'
+import NonConformanceRep from '@/views/quality/prevent/handle/components/NonConformanceRep.vue'
+import { addQualityCorrect, approvalDelete, cancelApproval, delteQualityCorrect, detailQualityCorrect, draftDelete, refuseApproval, submitQualityCorrect, updateQualityCorrect } from '@/api/quality/correct/index'
+import { getDictByCode } from '@/api/system/dict'
 import useUserStore from '@/store/modules/user'
+import { getSearchDept } from '@/api/quality/supervise/record'
+import { AGREE } from '@/views/quality/agree'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import ApprovalDialog from '@/components/ApprovalCustom/ApprovalDialog.vue'
+// 路由相关
 const $route = useRoute()
 const $router = useRouter()
+// 用户信息仓库
 const userStore = useUserStore()
 const ruleFormRef = ref<FormInstance>() // from组件
-const dialogStatus = ref('create')
+// 当前审批状态名字
+const approvalStatusName = $route.query.approvalStatusName as string
+// 表单
 const ruleForm = ref({
-  createTime: '',
+  fileName: '预防措施处理单',
+  bizLabCode: '',
+  supDeptId: '',
+  fileCode: '',
+  creator: '',
+  creatorName: '',
+  logTime: '',
   id: '',
-  temName: '',
-  temTip: '',
-  updateId: '',
-  updateName: '',
-  updateTime: '',
-}) // 表单
-const rules = ref<FormRules>({
-  temName: [{ required: true, message: '模板名称必填', trigger: ['blur', 'change'] }],
-}) // 表单验证规则
-// 模板管理内容列表
-onMounted(() => {
-  // const data = JSON.parse($route.query.row as string)
-  // ruleForm.value = data
-
-  // // 获取当前用户信息
-  // ruleForm.value.updateTime = dayjs().format('YYYY-MM-DD HH:mm') // 创建时间
-  // ruleForm.value.updateId = userStore.id
-  // ruleForm.value.updateName = userStore.name
+  correctiveActionFiles: [] as any[],
+  description: '',
+  taskId: '',
 })
-// 保存
+// 表单验证规则
+const rules = ref<FormRules>({
+  bizLabCode: [{ required: true, message: '实验室必选', trigger: ['blur', 'change'] }],
+  correctiveActionFiles: [{ required: true, message: '关联输入文件必选', trigger: ['blur', 'change'] }],
+  supDeptId: [{ required: true, message: '部门必选', trigger: ['blur', 'change'] }],
+})
+// 填充数据
+const fillData = () => {
+  if (sessionStorage.getItem('QualityCorrectHandler-info-flag')) {
+    ruleForm.value = JSON.parse(sessionStorage.getItem('QualityCorrectHandler-info') as string)
+    // 清空存储
+    sessionStorage.removeItem('QualityCorrectHandler-info-flag')
+    sessionStorage.removeItem('QualityCorrectHandler-info')
+    return false
+  }
+}
+
+const labelList = ref<{ id: string; value: string; name: string }[]>()// 实验室代码
+const deptList = ref<any[]>()// 部门
+// 获取字典值
+const fetchDict = () => {
+// 获取实验室代码字典
+  getDictByCode('bizLabCode').then((res) => {
+    labelList.value = res.data
+  })
+  // 部门
+  getSearchDept({ labCode: '' }).then((res) => {
+    deptList.value = res.data
+  })
+}
+fetchDict()
+// 监听实验室变化修改部门
+const watchFlag = ref(true)
+watch(() => ruleForm.value.bizLabCode, (newVal) => {
+  if (newVal) {
+    if ($route.path.includes('detail') || watchFlag.value) { return }
+    ruleForm.value.supDeptId = ''
+    getSearchDept({ labCode: newVal }).then((res) => {
+      deptList.value = res.data
+    })
+  }
+}, {
+  deep: true,
+})
+// 页面初始化
+onMounted(() => {
+  if ($route.path.includes('create')) {
+    watchFlag.value = false
+    // 默认填充信息
+    fillData()
+    ruleForm.value.creator = userStore.id
+    ruleForm.value.creatorName = userStore.name
+    ruleForm.value.logTime = dayjs().format('YYYY-MM-DD HH:mm')
+    // 自动关联不符合报告(启动纠正措施管理)
+    if ($route.params.id) {
+      ruleForm.value.correctiveActionFiles = [{ ...JSON.parse($route.query.row as string), fileType: '1' }]
+    }
+  }
+  else {
+    fillData()
+    detailQualityCorrect({ id: $route.params.id as string }).then((res) => {
+      // 详情
+      // console.log(res.data, '详情')
+      ruleForm.value = res.data
+      setTimeout(() => {
+        watchFlag.value = false
+      }, 500)
+    })
+  }
+})
+// ---------------------------------------------保存相关--------------------------------------
+const infoId = ref('')
+const createRow = () => {
+  addQualityCorrect(ruleForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    infoId.value = res.data
+  })
+}
+const updateRow = () => {
+  updateQualityCorrect(ruleForm.value).then((res) => {
+    ElMessage.success('操作成功')
+    infoId.value = res.data
+    if (approvalStatusName === '已取消' || approvalStatusName === '未通过') {
+      handleSubmit()
+    }
+  })
+}
 const saveForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) { return }
   await formEl.validate((valid, fields) => {
     if (valid) {
-      ElMessageBox.confirm(
-        '确认保存吗？',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning',
-        },
-      ).then((res) => {
-      })
+      if ($route.path.includes('create')) {
+        createRow()
+      }
+      else if ($route.path.includes('update')) {
+        updateRow()
+      }
     }
   })
 }
+// ---------------------------------------------审批--------------------------------------
+const taskId = ref($route.query.taskId as string || '') // 任务id，用于同意、驳回、拒绝审批
+const processId = ref($route.query.processId as string || '') // 流程实例id
+const approvalDialog = ref() // 审批组件ref
+const showApprovalButton = ref(true) // 是否展示审批按钮
+// 审批结束回调
+const approvalSuccess = () => {
+  showApprovalButton.value = false
+}
+// 审批
+const handleApprove = (val: string) => {
+  if (val === '取消') {
+    const params = {
+      processInstanceId: processId.value!,
+      comments: '',
+      id: ruleForm.value.id,
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已取消',
+          })
+          showApprovalButton.value = false
+        })
+      })
+  }
+  else if (val === '同意') {
+    approvalDialog.value.initDialog('agree', taskId.value)
+  }
+  else if (val === '拒绝') {
+    approvalDialog.value.initDialog('refuse', taskId.value, ruleForm.value.id)
+  }
+}
+// 拒绝
+const refuse = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
+    ElMessage({
+      type: 'success',
+      message: '已拒绝',
+    })
+    showApprovalButton.value = false
+  })
+}
+// 点击提交
+function handleSubmit() {
+  if (infoId.value || ruleForm.value.id) {
+    submitQualityCorrect({
+      formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL,
+      // processId: infoId.value,
+      id: infoId.value || ruleForm.value.id,
+    }).then(() => {
+      ElMessage.success('提交成功')
+      close()
+    })
+  }
+  else {
+    ElMessage.warning('请先保存')
+  }
+}
+// 点击编辑
+const handleEdit = () => {
+  $router.push({
+    path: `/correcthandle/update/${ruleForm.value.id}`,
+    query: { ...$route.query },
+  })
+}
+const del = () => {
+  if (approvalStatusName === '草稿箱') {
+    draftDelete({ id: ruleForm.value.id }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+  else if (approvalStatusName === '已取消') {
+    approvalDelete({ id: ruleForm.value.id, taskId: ruleForm.value.taskId }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+  else if (approvalStatusName === '全部') { // 全部的删除
+    delteQualityCorrect({ id: ruleForm.value.id }).then(() => {
+      ElMessage.success('已删除')
+      $router.go(-1)
+    })
+  }
+}
+// 关闭页面
+function close() {
+  $router.push({
+    path: '/correct/correcthandle',
+  })
+}
+const showMenu = ref('基本信息')
+defineExpose({
+  ruleForm, showMenu,
+})
+// 不符合要求情况分析报告弹窗
+const conformanceRef = ref()
+// 打开弹窗
+const selectConformance = () => {
+  conformanceRef.value.initDialog()
+}
+// 确认报告
+const confirmConformance = (report: any) => {
+  console.log(report, 'report')
+  ruleForm.value.correctiveActionFiles = report
+  ruleFormRef.value?.clearValidate('correctiveActionFiles')
+}
+// 报告详情
+const goDetail = () => {
+  const data = ruleForm.value.correctiveActionFiles[0]
+  sessionStorage.setItem('QualityCorrectHandler-info', JSON.stringify(ruleForm.value))
+  $router.push({
+    path: `/superviseanalysis/detail/${data.id}`,
+    query: {
+      approvalStatusName: '全部', // 审批状态名称
+      processId: data.processId, // 流程实例id
+      taskId: data.taskId, // 任务id
+      id: data.id,
+    },
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
-    <detail-page title="纠正措施处理单">
+    <!-- 不符合要求情况分析报告弹窗 -->
+    <non-conformance-rep ref="conformanceRef" @add="confirmConformance" />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :agree="AGREE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL" @on-success="approvalSuccess" @refuse="refuse" />
+    <detail-page title="预防措施处理单" class="info-header">
       <template #btns>
-        <el-button type="primary">
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '待审批' && showApprovalButton" type="primary" @click="handleApprove('同意')">
+          同意
+        </el-button>
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '待审批' && showApprovalButton" type="danger" @click="handleApprove('拒绝')">
+          拒绝
+        </el-button>
+        <el-button v-if="$route.path.includes('detail') && approvalStatusName === '审批中' && showApprovalButton" type="info" @click="handleApprove('取消')">
+          取消
+        </el-button>
+        <!-- :disabled="!infoId" -->
+        <el-button
+          v-if="$route.path.includes('create') || ($route.path.includes('update') && approvalStatusName !== '未通过' && approvalStatusName !== '已取消')"
+          type="primary"
+          @click="handleSubmit"
+        >
           提交
         </el-button>
-        <el-button type="primary" @click="saveForm(ruleFormRef)">
+        <el-button v-if="approvalStatusName !== '已审批' && $route.path.includes('detail') && approvalStatusName === '未通过'" type="primary" @click="handleEdit">
+          编辑
+        </el-button>
+        <el-button v-if="!$route.path.includes('detail')" type="primary" @click="saveForm(ruleFormRef)">
           保存
         </el-button>
-        <el-button type="info" @click="() => $router.go(-1)">
+        <el-button v-if="approvalStatusName === '已取消'" type="danger" @click="del">
+          删除
+        </el-button>
+        <el-button type="info" @click="close">
           关闭
         </el-button>
       </template>
     </detail-page>
-    <detail-block title="">
-      <el-form ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+    <detail-page v-if="approvalStatusName !== '草稿箱' && !$route.path.includes('create')" title="" class="info-radio">
+      <el-radio-group v-model="showMenu">
+        <el-radio-button label="基本信息" />
+        <el-radio-button label="审批详情" />
+      </el-radio-group>
+    </detail-page>
+    <!-- 基本信息 -->
+    <el-form v-show="showMenu === '基本信息'" ref="ruleFormRef" :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
+      <detail-block title="">
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="实验室代码" prop="temTip">
+            <el-form-item label="实验室代码" prop="bizLabCode">
               <el-select
-                v-model="ruleForm.storageLocation"
+                v-model="ruleForm.bizLabCode"
                 placeholder="实验室代码"
                 class="short-input"
                 filterable
                 style="width: 100%;"
               >
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="责任部门" prop="temTip">
+            <el-form-item label="部门" prop="supDeptId">
               <el-select
-                v-model="ruleForm.storageLocation"
-                placeholder="责任部门"
+                v-model="ruleForm.supDeptId"
+                placeholder="部门"
                 class="short-input"
                 filterable
                 style="width: 100%;"
               >
-                <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+                <el-option v-for="item in deptList" :key="item.id" :label="item.deptName" :value="item.deptId" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="文件编号" prop="temName">
-              <el-input v-model.trim="ruleForm.temName" />
+            <el-form-item label="处理单编号" prop="fileCode">
+              <el-input v-model.trim="ruleForm.fileCode" placeholder="系统自动生成" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="处理单名称" prop="fileName">
+              <el-input v-model.trim="ruleForm.fileName" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row :gutter="24" class="marg">
           <el-col :span="6">
-            <el-form-item label="文件名称" prop="updateName">
-              <el-input v-model.trim="ruleForm.updateName" disabled />
+            <el-form-item label="提出人" prop="creatorName">
+              <el-input v-model.trim="ruleForm.creatorName" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="提出人" prop="updateName">
-              <el-input v-model.trim="ruleForm.updateName" disabled />
+            <el-form-item label="记录时间" prop="logTime">
+              <!-- <el-input v-model.trim="ruleForm.logTime" disabled /> -->
+              <el-date-picker
+                v-model="ruleForm.logTime"
+                type="datetime"
+                style="width: 100%;"
+                format="YYYY-MM-DD HH:mm"
+                value-format="YYYY-MM-DD HH:mm"
+              />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="记录时间" prop="updateTime">
-              <!-- <el-input v-model.trim="ruleForm.time" disabled /> -->
-              <el-input v-model.trim="ruleForm.updateTime" disabled />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="24" class="marg">
           <el-col :span="12">
-            <el-form-item label-width="200px" label="关联不符合要求情况分析报告" prop="updateTime">
+            <el-form-item label-width="220px" label="关联输入文件" prop="correctiveActionFiles">
               <!-- <el-input v-model.trim="ruleForm.time" disabled /> -->
-              <el-button type="primary">
+              <el-link
+                v-if="ruleForm.correctiveActionFiles.length"
+                type="primary"
+                style="margin-right: 10px;"
+                @click="goDetail"
+              >
+                <!-- {{ ruleForm.correctiveActionFiles.length ? `${ruleForm.correctiveActionFiles[0].fileCode}-${ruleForm.correctiveActionFiles[0].fileName}` : '' }} -->
+                {{ ruleForm.correctiveActionFiles.length ? `${ruleForm.correctiveActionFiles[0].fileName}` : '' }}
+              </el-link>
+              <el-button v-if="!$route.path.includes('detail')" type="primary" @click="selectConformance">
                 选择
               </el-button>
-              <el-button type="primary">
-                上传
-              </el-button>
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-    </detail-block>
-    <detail-block title="">
-      <el-form :model="ruleForm" :class="$route.path.includes('detail') ? 'isDetail' : ''" :rules="rules" label-position="right" label-width="120px" class="form" :disabled="$route.path.includes('detail')">
-        <el-row :gutter="24" class="marg">
-          <el-col :span="24">
-            <el-form-item label-width="200px" label="存在不符合要求事实陈述" prop="conferenceTime" />
-          </el-col>
-        </el-row>
+      </detail-block>
+      <detail-block title="">
         <el-row :gutter="24" class="marg">
           <el-col :span="22">
-            <el-form-item label-width="200px" label="" prop="conferenceTime">
-              <el-input v-model.trim="ruleForm.conferenceTime" placeholder="存在不符合要求事实陈述" :rows="3" type="textarea" />
+            <el-form-item label-width="200px" label="存在不符合要求事实陈述" prop="description">
+              <el-input v-model.trim="ruleForm.description" placeholder="存在不符合要求事实陈述" :rows="3" type="textarea" />
             </el-form-item>
           </el-col>
         </el-row>
-      </el-form>
-    </detail-block>
+      </detail-block>
+    </el-form>
+    <!-- 审批详情 -->
+    <approval-record-table v-if="showMenu === '审批详情'" :process-id="processId" />
   </app-container>
 </template>
+
+<style lang="scss" scoped>
+// 详情页面隐藏小红点
+.isDetail {
+  ::v-deep {
+    .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label-wrap > .el-form-item__label::before,
+    .el-form-item.is-required:not(.is-no-asterisk) > .el-form-item__label::before {
+      content: "";
+      display: none;
+    }
+  }
+}
+
+.info-radio {
+  ::v-deep(.header) {
+    display: none;
+  }
+}
+</style>
diff --git a/src/views/quality/correct/handle/index.vue b/src/views/quality/correct/handle/index.vue
index 65b7e65..57c46d8 100644
--- a/src/views/quality/correct/handle/index.vue
+++ b/src/views/quality/correct/handle/index.vue
@@ -1,24 +1,39 @@
 <!-- 纠正措施处理单列表 -->
-<script name="QualityCorret" lang="ts" setup>
+<script name="QualityCorrect" lang="ts" setup>
+import { ElLoading, ElMessage, ElMessageBox } from 'element-plus'
 import { getDictByCode } from '@/api/system/dict'
 import type { TableColumn } from '@/components/NormalTable/table_interface'
+import { approvalDelete, cancelApproval, delteQualityCorrect, draftDelete, getQualityCorrectList, refuseApproval, submitQualityCorrect } from '@/api/quality/correct/index'
+import { getSearchDept } from '@/api/quality/supervise/record'
+import { AGREE } from '@/views/quality/agree'
+import { SCHEDULE } from '@/utils/scheduleDict'
+import filePreview from '@/views/quality/supervise/record/components/filePreviewSingle.vue'
+import ApprovalDialog from '@/components/ApprovalCustom/ApprovalDialog.vue'
+const approvalDialog = ref() // 审批对话ref
+const active = ref<string>('全部')
 // 查询条件
 const listQuery = ref({
-  startTime: '',
-  endTime: '',
-  checked: false,
+  approvalStatus: active.value,
+  fileCode: '',
+  bizLabCode: '',
+  supDeptId: '',
+  creatorName: '',
+  sourceType: '',
+  subTimeStart: '',
+  subTimeEnd: '',
   offset: 1,
   limit: 20,
+  formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL,
 })
 // 开始结束时间
 const datetimerange = ref()
 watch(() => datetimerange.value, (newVal) => {
-  listQuery.value.startTime = ''
-  listQuery.value.endTime = ''
+  listQuery.value.subTimeStart = ''
+  listQuery.value.subTimeEnd = ''
   if (Array.isArray(newVal)) {
     if (newVal.length) {
-      listQuery.value.startTime = `${newVal[0]} 00:00:00`
-      listQuery.value.endTime = `${newVal[1]} 23:59:59`
+      listQuery.value.subTimeStart = `${newVal[0]} 00:00:00`
+      listQuery.value.subTimeEnd = `${newVal[1]} 23:59:59`
     }
   }
 })
@@ -29,14 +44,13 @@
 const checkoutList = ref<string[]>([])// 选中的内容
 // 列
 const columns = ref<TableColumn[]>([
-  { text: '文件编号', value: 'standardNo', align: 'center' },
-  { text: '文件名称', value: 'standardNo', align: 'center' },
-  { text: '实验室', value: 'standardNo', align: 'center' },
-  { text: '责任部门', value: 'standardNo', align: 'center' },
-  { text: '提出人', value: 'standardNo', align: 'center' },
-  { text: '提出时间', value: 'standardNo', align: 'center' },
-  { text: '输入来源', value: 'standardNo', align: 'center' },
-  { text: '关联输入文件', value: 'standardNo', align: 'center' },
+  { text: '处理单编号', value: 'fileCode', align: 'center' },
+  { text: '处理单名称', value: 'fileName', align: 'center' },
+  { text: '实验室', value: 'bizLabCodeName', align: 'center' },
+  { text: '责任部门', value: 'deptName', align: 'center' },
+  { text: '提出人', value: 'creatorName', align: 'center' },
+  { text: '提出时间', value: 'subTime', align: 'center' },
+  { text: '输入来源', value: 'sourceTypeName', align: 'center' },
 ])
 // 数据查询
 function fetchData(isNowPage = false) {
@@ -45,21 +59,13 @@
     // 是否显示当前页，否则跳转第一页
     listQuery.value.offset = 1
   }
-  tableList.value = []
-  total.value = 0
-  loadingTable.value = false
-  // getStandardList(listQuery.value).then((response) => {
-  //   list.value = response.data.rows.map((item: { lastReviewDate: string; agreementAmount: number }) => {
-  //     return {
-  //       ...item,
-  //       lastReviewDate: item.lastReviewDate ? dayjs(item.lastReviewDate).format('YYYY-MM-DD') : item.lastReviewDate, // 最近复查日期
-  //     }
-  //   })
-  //   total.value = parseInt(response.data.total)
-  //   loadingTable.value = false
-  // }).catch(() => {
-  //   loadingTable.value = false
-  // })
+  getQualityCorrectList({ ...listQuery.value, formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL }).then((response) => {
+    tableList.value = response.data.rows
+    total.value = parseInt(response.data.total)
+    loadingTable.value = false
+  }).catch(() => {
+    loadingTable.value = false
+  })
 }
 // 搜索
 const searchList = () => {
@@ -70,12 +76,19 @@
 const clearList = () => {
   datetimerange.value = []
   listQuery.value = {
-    startTime: '',
-    endTime: '',
-    checked: false,
+    approvalStatus: active.value,
+    fileCode: '',
+    bizLabCode: '',
+    supDeptId: '',
+    creatorName: '',
+    sourceType: '',
+    subTimeStart: '',
+    subTimeEnd: '',
     offset: 1,
     limit: 20,
+    formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL,
   }
+  fetchData(true)
 }
 // 多选发生改变时
 function handleSelectionChange(e: any) {
@@ -95,8 +108,10 @@
 // 右上角菜单
 const buttonBoxActive = 'QualityCorrect'
 const menu = ref<any[]>([])
-const active = ref<string>('全部')
 // 查询字典
+const labelList = ref<{ id: string; value: string; name: string }[]>()// 实验室代码
+const deptList = ref<{ deptName: string; deptId: string }[]>([]) // 部门列表
+const sourceTypeList = ref<{ id: string; value: string; name: string }[]>([]) // 输入来源
 const getDict = async () => {
   // loadingTable.value = true
   // 审批状态
@@ -110,10 +125,31 @@
         name: tempFindData.name,
         id: `${tempFindData.value}`,
       })
-      // active.value = tempFindData
     }
   })
+  // 获取实验室代码字典
+  getDictByCode('bizLabCode').then((res) => {
+    labelList.value = res.data
+  })
+  // 输入来源
+  getDictByCode('quality_source_type').then((res) => {
+    sourceTypeList.value = res.data
+  })
+  //  部门列表
+  getSearchDept({ labCode: '' }).then((res) => {
+    deptList.value = res.data
+  })
 }
+watch(() => listQuery.value.bizLabCode, (newVal) => {
+  if (newVal) {
+    listQuery.value.supDeptId = ''
+    getSearchDept({ labCode: newVal }).then((res) => {
+      deptList.value = res.data
+    })
+  }
+}, {
+  deep: true,
+})
 const changeCurrentButton = (val: string) => {
   active.value = val
   window.sessionStorage.setItem(buttonBoxActive, val)
@@ -126,6 +162,106 @@
     path: `/correcthandle/${type}`,
   })
 }
+const handleEdit = (row: any, type: string) => {
+  if (type === 'update' || type === 'detail' || type === 'create') { // 编辑、详情
+    $router.push({
+      path: `/correcthandle/${type}/${row.id}`,
+      query: {
+        approvalStatusName: active.value === '0' ? '全部' : active.value === '7' ? '已审批' : row.approvalStatusName, // 审批状态名称
+        processId: row.processId, // 流程实例id
+        taskId: row.taskId, // 任务id
+        id: row.id,
+      },
+    })
+  }
+  else if (type === '同意') {
+    approvalDialog.value.initDialog('agree', row.taskId)
+  }
+  else if (type === '拒绝') {
+    approvalDialog.value.initDialog('refuse', row.taskId, row.id)
+  }
+  else if (type === '取消') {
+    const params = {
+      processInstanceId: row.processId!,
+      comments: '',
+      id: row.id,
+    }
+    ElMessageBox.confirm(
+      '确认取消该审批吗？',
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    )
+      .then(() => {
+        cancelApproval(params).then((res) => {
+          ElMessage({
+            type: 'success',
+            message: '已取消',
+          })
+          fetchData(true)
+        })
+      })
+  }
+  else {
+    ElMessageBox.confirm(
+      `确认${type}吗？`,
+      '提示',
+      {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      },
+    ).then(() => {
+      if (type === '删除' && row.approvalStatusName === '草稿箱') {
+        draftDelete({ id: row.id }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+      else if (type === '删除' && row.approvalStatusName === '已取消') {
+        approvalDelete({ id: row.id, taskId: row.taskId }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+      else if (type === '删除' && active.value === '0') { // 全部的删除
+        // delRef.value.initDialog(row)
+        delteQualityCorrect({ id: row.id }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+      else if (type === '提交' && active.value === '1') {
+        submitQualityCorrect({ id: row.id, formId: SCHEDULE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL }).then(() => {
+          ElMessage.success(`已${type}`)
+          fetchData()
+        })
+      }
+    })
+  }
+}
+// 审批结束回调
+const approvalSuccess = () => {
+  fetchData(true)
+}
+// 拒绝
+const refuse = (comments: string, taskId: string, id: string) => {
+  const params = {
+    id,
+    taskId, // 任务id
+    comments, // 拒绝原因
+  }
+  refuseApproval(params).then((res) => {
+    ElMessage({
+      type: 'success',
+      message: '已拒绝',
+    })
+    fetchData(true)
+  })
+}
 onMounted(async () => {
   await getDict()
   if (window.sessionStorage.getItem(buttonBoxActive)) {
@@ -134,7 +270,6 @@
   else {
     active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部
   }
-  searchList()
 })
 </script>
 
@@ -142,50 +277,49 @@
   <app-container>
     <!-- 右上角按钮集合 -->
     <button-box :active="active" :menu="menu" @change-current-button="changeCurrentButton" />
+    <!-- 审批弹窗 -->
+    <approval-dialog ref="approvalDialog" :agree="AGREE.CORRECT_MEASURE_PROCESS_SHEET_APPROVAL" @on-success="approvalSuccess" @refuse="refuse" />
     <search-area :need-clear="true" @search="searchList" @clear="clearList">
       <search-item>
         <el-input
-          v-model="listQuery.storageLocation"
+          v-model="listQuery.fileCode"
           placeholder="处理单编号"
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.storageLocation"
-          placeholder="实验室代码"
+          v-model="listQuery.bizLabCode"
+          placeholder="实验室"
           class="short-input"
           filterable
-          style="width: 100%;"
         >
-          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item in labelList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.storageLocation"
-          placeholder="责任部门"
+          v-model="listQuery.supDeptId"
+          placeholder="部门"
           class="short-input"
           filterable
-          style="width: 100%;"
         >
-          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
         </el-select>
       </search-item>
       <search-item>
         <el-input
-          v-model="listQuery.storageLocation"
+          v-model="listQuery.creatorName"
           placeholder="提出人"
         />
       </search-item>
       <search-item>
         <el-select
-          v-model="listQuery.storageLocation"
+          v-model="listQuery.sourceType"
           placeholder="输入来源"
           class="short-input"
           filterable
-          style="width: 100%;"
         >
-          <el-option v-for="item in []" :key="item.id" :label="item.name" :value="item.value" />
+          <el-option v-for="item in sourceTypeList" :key="item.id" :label="item.name" :value="item.value" />
         </el-select>
       </search-item>
       <search-item>
@@ -214,12 +348,24 @@
         </template>
         <template #columns>
           <el-table-column
+            label="关联输入文件"
+            align="center"
+          >
+            <template #default="{ row }">
+              <div class="container">
+                <div v-for="(item, index) in row.correctiveActionFiles || []" :key="item.id" :class="`${index === 0 ? '' : 'item'}`">
+                  <file-preview :minio-file-name="item.fileName" :minio-file-path="item.filePath || ''" />
+                </div>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
             v-if="active !== '0'"
             label="审批状况"
             align="center"
           >
             <template #default="{ row }">
-              {{ row }}
+              {{ row.approvalStatusName }}
             </template>
           </el-table-column>
           <el-table-column
@@ -229,24 +375,76 @@
           >
             <template #default="{ row }">
               <el-button
+                v-if="active === '1'"
                 size="small"
                 type="primary"
                 link
+                @click="handleEdit(row, '提交')"
               >
-                详情 {{ row }}
+                提交
               </el-button>
               <el-button
+                v-if="active !== '1' && active !== '6' && active !== '5'"
                 size="small"
                 type="primary"
                 link
+                @click="handleEdit(row, 'detail')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if=" active === '1' || active === '6' || active === '5'"
+                size="small"
+                type="primary"
+                link
+                @click="handleEdit(row, 'update')"
+              >
+                查看
+              </el-button>
+              <el-button
+                v-if="row.approvalStatus === '2'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, '同意')"
+              >
+                同意
+              </el-button>
+              <el-button
+                v-if="row.approvalStatus === '2'"
+                size="small"
+                link
+                type="danger"
+                @click="handleEdit(row, '拒绝')"
+              >
+                拒绝
+              </el-button>
+              <el-button
+                v-if="active === '0'"
+                size="small"
+                link
+                type="primary"
+                @click="handleEdit(row, 'update')"
               >
                 编辑
               </el-button>
+
+              <!-- 是发起者且审批中可以取消 -->
               <el-button
-                v-if="active === '1'"
+                v-if="row.approvalStatusName === '审批中' && active !== '7' && active !== '0'"
                 size="small"
-                type="danger"
                 link
+                type="info"
+                @click="handleEdit(row, '取消')"
+              >
+                取消
+              </el-button>
+              <el-button
+                v-if="active !== '7' && (active === '0' || row.approvalStatusName === '草稿箱' || row.approvalStatusName === '已取消')"
+                size="small"
+                link
+                type="danger"
+                @click="handleEdit(row, '删除')"
               >
                 删除
               </el-button>
@@ -258,3 +456,17 @@
   </app-container>
 </template>
 
+<style lang="scss" scope>
+.container {
+  // display: flex;
+  width: 100%;
+
+  .item {
+    float: left;
+    border-top: 1px solid #ebeef5;
+    text-align: center;
+    width: 100%;
+  }
+}
+</style>
+
diff --git a/src/views/quality/prevent/handle/index.vue b/src/views/quality/prevent/handle/index.vue
index fc4a9d5..fb18676 100644
--- a/src/views/quality/prevent/handle/index.vue
+++ b/src/views/quality/prevent/handle/index.vue
@@ -348,7 +348,7 @@
         </template>
         <template #columns>
           <el-table-column
-            label="关联输入文件"
+            label="关联不符合要求情况分析报告"
             align="center"
           >
             <template #default="{ row }">
diff --git a/src/views/quality/supervise/analysis/components/detail.vue b/src/views/quality/supervise/analysis/components/detail.vue
index bfaeff4..99216f1 100644
--- a/src/views/quality/supervise/analysis/components/detail.vue
+++ b/src/views/quality/supervise/analysis/components/detail.vue
@@ -70,6 +70,10 @@
   if (sessionStorage.getItem('QualityPreventHandler-info')) {
     sessionStorage.setItem('QualityPreventHandler-info-flag', '1')
   }
+  // 向纠正措施单页面传递填充页面信号
+  if (sessionStorage.getItem('QualityCorrectHandler-info')) {
+    sessionStorage.setItem('QualityCorrectHandler-info-flag', '1')
+  }
   $router.go(-1)
 }
 // 启动预防措施管理
@@ -82,13 +86,23 @@
     },
   })
 }
+// 启动纠正措施管理
+const startCorrect = () => {
+  const data = JSON.parse($route.query.row as string)
+  $router.push({
+    path: `/correcthandle/create/${data.id}`,
+    query: {
+      row: $route.query.row as string,
+    },
+  })
+}
 </script>
 
 <template>
   <app-container style="overflow: hidden;">
     <detail-page title="不符合要求情况分析报告">
       <template #btns>
-        <el-button type="primary">
+        <el-button type="primary" @click="startCorrect">
           启动纠正措施管理
         </el-button>
         <el-button type="primary" @click="startPrevent">