From 8486a91b260bfbdb18441241ff3491fe8b948e6e Mon Sep 17 00:00:00 2001 From: wangchengming <15110151257@163.com> Date: Fri, 18 Jul 2025 12:05:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=89=E5=85=A8=E5=AE=A1?= =?UTF-8?q?=E6=9F=A5=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/safetyReview.js | 9 +++ src/views/safetyReview/dashboard/index.vue | 2 +- .../examinerApproval/approvalForm.vue | 42 +++++++++++- .../examinerApproval/detailForm.vue | 66 +++++++++++------- .../examinerEscTask/detailForm.vue | 67 ++++++++++++------- .../examinerEscTask/escTaskForm.vue | 44 +++++++++++- .../safetyReview/examinerTasks/index.vue | 16 +++-- 7 files changed, 189 insertions(+), 57 deletions(-) diff --git a/src/api/safetyReview.js b/src/api/safetyReview.js index 78c6b2b..0888fec 100644 --- a/src/api/safetyReview.js +++ b/src/api/safetyReview.js @@ -87,3 +87,12 @@ export function checkStatus(query) { data: query }) } + +// 获取安全审查审批记录 +export function busReviewProblemRecordPage(query) { + return request({ + url: '/admin/busReviewProblemRecord/getBusReviewProblemRecordPage', + method: 'post', + data: query + }) +} diff --git a/src/views/safetyReview/dashboard/index.vue b/src/views/safetyReview/dashboard/index.vue index 012e964..0ba85d0 100644 --- a/src/views/safetyReview/dashboard/index.vue +++ b/src/views/safetyReview/dashboard/index.vue @@ -701,7 +701,7 @@ const initShunYi = () => { }) .attr('y', bbox.y + 30); - // 添加待审查图标 + // 添加待审查图标 true 需要审查 false不需要审查 if (!data.isChecked) { svg.append('image') .attr('xlink:href', iconShencha) diff --git a/src/views/safetyReview/examinerApproval/approvalForm.vue b/src/views/safetyReview/examinerApproval/approvalForm.vue index 35f45bc..27b992a 100644 --- a/src/views/safetyReview/examinerApproval/approvalForm.vue +++ b/src/views/safetyReview/examinerApproval/approvalForm.vue @@ -92,6 +92,31 @@ + +
审批记录
+
+ + + + + + + + + + + + +
@@ -137,7 +162,7 @@ import iconZip from '@/assets/images/iconZip.png' import iconMove from '@/assets/images/iconMove.png' import iconTxt from '@/assets/images/iconTxt.png' import iconPpt from '@/assets/images/iconPpt.png' -import { escBusReviewProblemDetail, checkStatus } from "@/api/safetyReview" +import { escBusReviewProblemDetail, checkStatus, busReviewProblemRecordPage } from "@/api/safetyReview" const router = useRouter() const route = useRoute() @@ -166,6 +191,7 @@ onMounted(() => { console.log('接收id', id) // detailForm.value.id = id getDetailInfo(id) + getReviewProblemRecord(id) } }); // 获取详情 @@ -179,6 +205,20 @@ const getDetailInfo = (id) => { } }) } +// 审批记录 +const tableData = ref([]) +// 获取审批记录 +const getReviewProblemRecord = (_id) => { + var queryParamsRecord = { + pageIndex: 1, + pageSize: 50, + reviewProblemId: _id + } + busReviewProblemRecordPage(queryParamsRecord).then(res => { + console.log('审批记录', res.data.list) + if (res.code == 200) tableData.value = res.data.list + }) +} // 审批状态改变 const handleApplyStateChange = (value) => { if (value == 2) detailForm.value.checkRemark = '通过' diff --git a/src/views/safetyReview/examinerApproval/detailForm.vue b/src/views/safetyReview/examinerApproval/detailForm.vue index fb48ea5..f1a3eff 100644 --- a/src/views/safetyReview/examinerApproval/detailForm.vue +++ b/src/views/safetyReview/examinerApproval/detailForm.vue @@ -92,29 +92,32 @@ - - + @@ -137,12 +140,12 @@ import iconZip from '@/assets/images/iconZip.png' import iconMove from '@/assets/images/iconMove.png' import iconTxt from '@/assets/images/iconTxt.png' import iconPpt from '@/assets/images/iconPpt.png' -import { escBusReviewProblemDetail } from "@/api/safetyReview" +import { escBusReviewProblemDetail, busReviewProblemRecordPage } from "@/api/safetyReview" const router = useRouter() const route = useRoute() const levelList = ref([ - { title: '高压安全审查', path: '/safetyReview' }, + { title: '高压安全审查', path: '/safetyReview' }, { title: '审核员审批', path: '/safetyReview/examinerApproval' }, { title: '问题详情', path: '/safetyReview/examinerViewProblem' } ]) @@ -166,6 +169,7 @@ onMounted(() => { console.log('接收id', id) // detailForm.value.id = id getDetailInfo(id) + getReviewProblemRecord(id) } }); // 获取详情 @@ -178,12 +182,26 @@ const getDetailInfo = (id) => { : [] } }) -} +} +// 审批记录 +const tableData = ref([]) +// 获取审批记录 +const getReviewProblemRecord = (_id) => { + var queryParamsRecord = { + pageIndex: 1, + pageSize: 50, + reviewProblemId: _id + } + busReviewProblemRecordPage(queryParamsRecord).then(res => { + console.log('审批记录', res.data.list) + if (res.code == 200) tableData.value = res.data.list + }) +} // 判断是否为图片文件 const isImageFile = (suffix) => { return ['jpeg', 'jpg', 'png'].includes(suffix?.toLowerCase()) } - +