taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(违规记录): 新增整改和复查功能

Browse Source 
- 在API层添加addSafetyInspectionReview和addSafetyInspectionRectification方法
- 在违规记录页面增加整改和复查操作按钮
- 新增处理对话框用于提交整改措施和复查情况
This commit is contained in:
tcy
2025-09-14 16:56:27 +08:00
parent 660fd34238
commit 357f34b316
2 changed files with 121 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/api/safety/violationRecord/index.ts
View File

@ -61,3 +61,23 @@ export const delViolationRecord = (id: string | number | Array<string | number>)
method: 'delete'
});
};
/**
* 新增违规记录复查
*/
export const addSafetyInspectionReview = (data: any) => {
return request({
url: '/safety/violationRecord/review',
method: 'post',
data: data
});
}
/**
* 新增违规记录整改
*/
export const addSafetyInspectionRectification = (data: any) => {
return request({
url: '/safety/violationRecord/rectification',
method: 'post',
data: data
});
}

117
src/views/safety/violationRecord/index.vue
View File

@ -1,6 +1,7 @@
<template>
<div class="p-2">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
<transition :enter-active-class="proxy?.animate.searchAnimate.enter"
:leave-active-class="proxy?.animate.searchAnimate.leave">
<div v-show="showSearch" class="mb-[10px]">
<el-card shadow="hover">
<el-form ref="queryFormRef" :model="queryParams" :inline="true">
@ -8,7 +9,8 @@
<el-input v-model="queryParams.id" placeholder="请输入工单号" clearable @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="违章时间" prop="violationTime">
<el-date-picker clearable v-model="queryParams.violationTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择违章时间" />
<el-date-picker clearable v-model="queryParams.violationTime" type="date" value-format="YYYY-MM-DD"
placeholder="请选择违章时间" />
</el-form-item>
<el-form-item>
@ -24,9 +26,8 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['safety:violationRecord:remove']"
>删除</el-button
>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
v-hasPermi="['safety:violationRecord:remove']">删除</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -38,7 +39,8 @@
<el-table-column label="违章等级" align="center" prop="levelVo" width="180">
<template #default="scope">
<div class="flex justify-center">
{{ scope.row.levelVo.violationLevel }}：<dict-tag :options="risk_level_type" :value="scope.row.levelVo.riskType" />
{{ scope.row.levelVo.violationLevel }}：<dict-tag :options="risk_level_type"
:value="scope.row.levelVo.riskType" />
</div>
</template>
</el-table-column>
@ -77,28 +79,37 @@
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240">
<template #default="scope">
<el-space>
<el-tooltip content="详情" placement="top">
<el-button
link
type="primary"
icon="View"
@click="handleShowDialog(scope.row)"
v-hasPermi="['safety:violationRecord:view']"
></el-button>
<el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)"
v-hasPermi="['safety:violationRecord:view']"></el-button>
</el-tooltip>
<el-tooltip content="违章处理人" placement="top">
<el-button link type="primary" icon="User" @click="handleUpdate(scope.row)" v-hasPermi="['safety:violationRecord:edit']"></el-button>
<el-button link type="primary" icon="User" @click="handleUpdate(scope.row)"
v-hasPermi="['safety:violationRecord:edit']"></el-button>
</el-tooltip>
<el-tooltip content="删除" placement="top">
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:violationRecord:remove']"></el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['safety:violationRecord:remove']"></el-button>
</el-tooltip>
<el-tooltip content="整改" placement="top" v-if="scope.row.status == 1">
<el-button link type="success" icon="Pointer" @click="handleDialog(scope.row)"
v-hasPermi="['safety:violationRecord:rectification']">整改</el-button>
</el-tooltip>
<el-tooltip content="复查" placement="top" v-if="scope.row.status == 2">
<el-button link type="warning" icon="SuccessFilled" @click="handleDialog(scope.row)"
v-hasPermi="['safety:violationRecord:review']">复查</el-button>
</el-tooltip>
</el-space>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize" @pagination="getList" />
</el-card>
<!-- 添加或修改违规记录对话框 -->
<el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
@ -107,7 +118,8 @@
<el-input v-model="form.handlerId" placeholder="请输入违章处理人" />
</el-form-item>
<el-form-item label="处理期限" prop="disposeDeadline">
<el-date-picker clearable v-model="form.disposeDeadline" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择处理期限">
<el-date-picker clearable v-model="form.disposeDeadline" type="datetime" value-format="YYYY-MM-DD HH:mm:ss"
placeholder="请选择处理期限">
</el-date-picker>
</el-form-item>
<el-form-item label="备注" prop="remark">
@ -124,17 +136,40 @@
<el-dialog title="违规记录详情" v-model="showDetailDialog" width="60vw">
<ViolationRecordDetailDialog :violation-record-id="currentViolationRecordId" />
</el-dialog>
<el-dialog :title="handleType === 'rectification' ? '处理整改工单' : '处理复查工单'" v-model="handleDialogVisible"
width="500px">
<el-form ref="handleFormRef" :model="handleForm" :rules="rules" label-width="120px">
<el-form-item label="整改措施" prop="measure" v-if="handleType === 'rectification'">
<el-input v-model="handleForm.measure" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="整改附件" prop="rectificationFile" v-if="handleType === 'rectification'">
<image-upload v-model="handleForm.rectificationFile" />
</el-form-item>
<el-form-item label="复查情况" prop="review" v-if="handleType === 'review'">
<el-input v-model="handleForm.review" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="复查类型" prop="reviewType" v-if="handleType === 'review'">
<el-select v-model="handleForm.reviewType" placeholder="请选择复查类型">
<el-option v-for="dict in review_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="handleSubmit">确 定</el-button>
</el-form-item>
</el-form>
</el-dialog>
</div>
</template>
<script setup name="ViolationRecord" lang="ts">
import { listViolationRecord, getViolationRecord, delViolationRecord, addViolationRecord, updateViolationRecord } from '@/api/safety/violationRecord';
import { listViolationRecord, getViolationRecord, delViolationRecord, addViolationRecord, updateViolationRecord, addSafetyInspectionReview, addSafetyInspectionRectification } from '@/api/safety/violationRecord';
import { ViolationRecordVO, ViolationRecordQuery, ViolationRecordForm } from '@/api/safety/violationRecord/types';
import ViolationRecordDetailDialog from './component/violationRecordDetailDialog.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { violation_level_type, risk_level_type, safety_inspection_type } = toRefs<any>(
proxy?.useDict('violation_level_type', 'risk_level_type', 'safety_inspection_type')
const { violation_level_type, risk_level_type, safety_inspection_type, review_type } = toRefs<any>(
proxy?.useDict('violation_level_type', 'risk_level_type', 'safety_inspection_type', 'review_type')
);
const violationRecordList = ref<ViolationRecordVO[]>([]);
@ -150,7 +185,11 @@ const showDetailDialog = ref(false);
const queryFormRef = ref<ElFormInstance>();
const violationRecordFormRef = ref<ElFormInstance>();
const handleType = ref<string>('');
const handleForm = ref({
id: undefined,
})
const handleDialogVisible = ref(false);
const dialog = reactive<DialogOption>({
visible: false,
title: ''
@ -208,6 +247,29 @@ const data = reactive<PageData<ViolationRecordForm, ViolationRecordQuery>>({
const { queryParams, form, rules } = toRefs(data);
/** 处理安全巡查工单 */
const handleSubmit = async () => {
let flag = false;
if (handleType.value == "rectification") {
const { code } = await addSafetyInspectionRectification(handleForm.value)
if (code == 200) flag = true
} else {
const { code } = await addSafetyInspectionReview(handleForm.value)
if (code == 200) flag = true
}
if (flag) {
ElMessage.success("处理成功")
handleDialogVisible.value = false;
getList()
reset()
} else {
ElMessage.error("处理失败")
}
}
/** 查询违规记录列表 */
const getList = async () => {
loading.value = true;
@ -217,6 +279,17 @@ const getList = async () => {
loading.value = false;
};
const handleDialog = (row) => {
if (row.status == '1') {
handleType.value = "rectification"
} else {
handleType.value = "review"
}
handleForm.value.id = row.id;
handleDialogVisible.value = true;
};
/** 取消按钮 */
const cancel = () => {
reset();