修复安全审查审批流程

This commit is contained in:
wangchengming 2025-07-18 12:05:09 +08:00
parent 3bc99669ea
commit 8486a91b26
7 changed files with 189 additions and 57 deletions

View File

@ -87,3 +87,12 @@ export function checkStatus(query) {
data: query
})
}
// 获取安全审查审批记录
export function busReviewProblemRecordPage(query) {
return request({
url: '/admin/busReviewProblemRecord/getBusReviewProblemRecordPage',
method: 'post',
data: query
})
}

View File

@ -701,7 +701,7 @@ const initShunYi = () => {
})
.attr('y', bbox.y + 30);
//
// true false
if (!data.isChecked) {
svg.append('image')
.attr('xlink:href', iconShencha)

View File

@ -92,6 +92,31 @@
</el-form-item>
</div>
<div class="headerTitle">审批记录</div>
<div class="applyFormContainer">
<el-table :data="tableData" style="width: 100%;margin-bottom: 20px;">
<el-table-column label="序号" width="160">
<template #default="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="checkStatus" label="节点名称" width="260">
<template #default="scope">
<span v-if="scope.row.checkStatus == 1">提交整改</span>
<span v-if="scope.row.checkStatus == 2">审批通过</span>
<span v-if="scope.row.checkStatus == 9">审批驳回</span>
</template>
</el-table-column>
<el-table-column prop="checkRemark" label="审批意见" min-width="100" align="left" />
<el-table-column prop="createTime" label="审批时间" width="230">
<template #default="scope">
<span v-if="scope.row.createTime"> {{ scope.row.createTime }}</span>
<span v-else>-</span>
</template>
</el-table-column>
</el-table>
</div>
</el-form>
<el-form ref="ruleFormRef" :model="detailForm" :rules="rules" label-position="top">
@ -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 = '通过'

View File

@ -92,29 +92,32 @@
</el-form-item>
</div>
</el-form>
<!-- <el-form ref="ruleFormRef" :model="detailForm" :rules="rules" label-position="top">
<div class="headerTitle">审批信息</div>
<div class="headerTitle">审批记录</div>
<div class="applyFormContainer">
<el-row class="myRow" :gutter="20">
<el-col :span="6">
<el-form-item label="审批结果" prop="state">
<el-radio-group v-model="detailForm.state" @change="handleApplyStateChange">
<el-radio value="9">驳回</el-radio>
<el-radio value="2">通过</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="审批意见" prop="checkRemark">
<el-input v-model="detailForm.checkRemark" style="width: 100%" :rows="5"
type="textarea" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
<el-table :data="tableData" style="width: 100%;margin-bottom: 20px;">
<el-table-column label="序号" width="160">
<template #default="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="checkStatus" label="节点名称" width="260">
<template #default="scope">
<span v-if="scope.row.checkStatus == 1">提交整改</span>
<span v-if="scope.row.checkStatus == 2">审批通过</span>
<span v-if="scope.row.checkStatus == 9">审批驳回</span>
</template>
</el-table-column>
<el-table-column prop="checkRemark" label="审批意见" min-width="100" align="left" />
<el-table-column prop="createTime" label="审批时间" width="230">
<template #default="scope">
<span v-if="scope.row.createTime"> {{ scope.row.createTime }}</span>
<span v-else>-</span>
</template>
</el-table-column>
</el-table>
</div>
</el-form> -->
</el-form>
</el-card>
</div>
@ -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())
}
</script>
<style lang='scss'>
.app-main {

View File

@ -92,29 +92,32 @@
</el-form-item>
</div>
</el-form>
<!-- <el-form ref="ruleFormRef" :model="detailForm" :rules="rules" label-position="top">
<div class="headerTitle">审批信息</div>
<div class="headerTitle">审批记录</div>
<div class="applyFormContainer">
<el-row class="myRow" :gutter="20">
<el-col :span="6">
<el-form-item label="审批结果" prop="state">
<el-radio-group v-model="detailForm.state" @change="handleApplyStateChange">
<el-radio value="9">驳回</el-radio>
<el-radio value="2">通过</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="18">
<el-form-item label="审批意见" prop="checkRemark">
<el-input v-model="detailForm.checkRemark" style="width: 100%" :rows="5"
type="textarea" placeholder="请输入" />
</el-form-item>
</el-col>
</el-row>
<el-table :data="tableData" style="width: 100%;margin-bottom: 20px;">
<el-table-column label="序号" width="160">
<template #default="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="checkStatus" label="节点名称" width="260">
<template #default="scope">
<span v-if="scope.row.checkStatus == 1">提交整改</span>
<span v-if="scope.row.checkStatus == 2">审批通过</span>
<span v-if="scope.row.checkStatus == 9">审批驳回</span>
</template>
</el-table-column>
<el-table-column prop="checkRemark" label="审批意见" min-width="100" align="left" />
<el-table-column prop="createTime" label="审批时间" width="230">
<template #default="scope">
<span v-if="scope.row.createTime"> {{ scope.row.createTime }}</span>
<span v-else>-</span>
</template>
</el-table-column>
</el-table>
</div>
</el-form> -->
</el-form>
</el-card>
</div>
@ -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: 'ESC任务', path: '/safetyReview/examinerEscTask' },
{ title: '问题详情', path: '/safetyReview/examinerEscViewProblem' }
])
@ -166,6 +169,7 @@ onMounted(() => {
console.log('接收id', id)
// detailForm.value.id = id
getDetailInfo(id)
getReviewProblemRecord(id)
}
});
//
@ -178,12 +182,27 @@ 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())
}
</script>
<style lang='scss'>
.app-main {

View File

@ -63,7 +63,33 @@
</el-col>
</el-row>
</div>
<div class="headerTitle">审批记录</div>
<div class="applyFormContainer">
<el-table :data="tableData" style="width: 100%;margin-bottom: 20px;">
<el-table-column label="序号" width="160">
<template #default="scope">
{{ scope.$index + 1 }}
</template>
</el-table-column>
<el-table-column prop="checkStatus" label="节点名称" width="260">
<template #default="scope">
<span v-if="scope.row.checkStatus == 1">提交整改</span>
<span v-if="scope.row.checkStatus == 2">审批通过</span>
<span v-if="scope.row.checkStatus == 9">审批驳回</span>
</template>
</el-table-column>
<el-table-column prop="checkRemark" label="审批意见" min-width="100" align="left" />
<el-table-column prop="createTime" label="审批时间" width="230">
<template #default="scope">
<span v-if="scope.row.createTime"> {{ scope.row.createTime }}</span>
<span v-else>-</span>
</template>
</el-table-column>
</el-table>
</div>
</el-form>
<el-form ref="ruleFormRef" :model="detailForm" :rules="rules" label-position="top">
<div class="headerTitle">整改结果</div>
<div class="applyFormContainer">
@ -131,7 +157,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, escCorrection } from "@/api/safetyReview"
import { escBusReviewProblemDetail, escCorrection, busReviewProblemRecordPage } from "@/api/safetyReview"
const router = useRouter()
const route = useRoute()
@ -161,6 +187,7 @@ onMounted(() => {
console.log('接收id', id)
// detailForm.value.id = id
getDetailInfo(id)
getReviewProblemRecord(id)
}
});
//
@ -174,7 +201,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 isImageFile = (suffix) => {

View File

@ -46,6 +46,12 @@
<el-table-column prop="deptName" label="部门" min-width="150" />
<el-table-column prop="workNo" label="ESC工号" min-width="130" />
<el-table-column prop="escUserName" label="ESC" min-width="100" />
<el-table-column prop="reviewState" label="状态" width="120">
<template #default="scope">
<el-text v-if="scope.row.reviewState == 1" type="success" class="successText">整改完成</el-text>
<el-text v-else type="danger" class="dangerText">待整改</el-text>
</template>
</el-table-column>
<el-table-column prop="openItemCount" label="开口项数量" min-width="130" />
<el-table-column prop="reviewDate" label="审查时间" min-width="130">
<template #default="scope">
@ -61,11 +67,11 @@
</el-table-column>
<el-table-column label="操作" fixed="right" width="130">
<template #default="scope">
<el-button type="primary" text class="replayTextBtn" v-hasPermi="['examinerTasks:edit']"
@click="handleEdit(scope.row)">编辑</el-button>
<el-divider direction="vertical" class="verticalLine" />
<el-button type="primary" text class="deleteTextBtn" v-hasPermi="['examinerTasks:delete']"
@click="handleDelete(scope.row)">删除</el-button>
<el-button v-if="scope.row.reviewState != 1" type="primary" text class="replayTextBtn"
v-hasPermi="['examinerTasks:edit']" @click="handleEdit(scope.row)">编辑</el-button>
<el-divider v-if="scope.row.reviewState != 1" direction="vertical" class="verticalLine" />
<el-button v-if="scope.row.reviewState != 1" type="primary" text class="deleteTextBtn"
v-hasPermi="['examinerTasks:delete']" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>