This commit is contained in:
Teo
2025-09-15 11:47:06 +08:00
5 changed files with 144 additions and 65 deletions

View File

@ -2,15 +2,16 @@
<!-- <el-card v-loading="loading" body-class="printMe"> -->
<div class="w75% m-a">
<div id="printMe" class="pos-relative">
<div class="resultIcon"><img :src="'../../../../../src/assets/icons/svg/' + inspectionType + '.png'" alt="" /></div>
<div class="resultIcon"><img :src="'../../../../../src/assets/icons/svg/' + inspectionType + '.png'" alt="" />
</div>
<h2 style="text-align: center; margin-top: 5px; font-weight: bold">整改通知单</h2>
<el-row>
<el-col :span="12" style="text-align: left">填报人{{ safetyInspectionDetail?.createBy }}</el-col>
<el-col :span="12" style="text-align: right">填报时间{{ safetyInspectionDetail?.createTime }}</el-col>
</el-row>
<el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
<el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra"
>{{ safetyInspectionDetail?.projectName }}
<el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra">{{
safetyInspectionDetail?.projectName }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="巡检标题" :span="2" label-class-name="white">
{{ safetyInspectionDetail?.inspectionHeadline }}
@ -24,22 +25,22 @@
<el-descriptions-item label-align="center" label="巡检类型" label-class-name="white">
<dict-tag :options="quality_inspection_check_type" :value="safetyInspectionDetail?.inspectionType" />
</el-descriptions-item>
<el-descriptions-item label-align="center" label="填报人" label-class-name="white"
>{{ safetyInspectionDetail?.createBy }}
<el-descriptions-item label-align="center" label="填报人" label-class-name="white">{{
safetyInspectionDetail?.createBy }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="填报日期" class-name="zebra"
>{{ safetyInspectionDetail?.createTime }}
<el-descriptions-item label-align="center" label="填报日期" class-name="zebra">{{ safetyInspectionDetail?.createTime
}}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="要求回复期限" class-name="zebra"
>{{ parseTime(safetyInspectionDetail?.replyPeriodDate, '{y}-{m}-{d}') }}
<el-descriptions-item label-align="center" label="要求回复期限" class-name="zebra">{{
parseTime(safetyInspectionDetail?.replyPeriodDate, '{y}-{m}-{d}') }}
</el-descriptions-item>
</el-descriptions>
<el-descriptions border direction="vertical" size="large">
<el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
</el-descriptions>
<el-descriptions :column="2" border label-width="160px" size="large">
<el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
>{{ safetyInspectionDetail?.inspectionResult }}
<el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white">{{
safetyInspectionDetail?.inspectionResult }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
<el-space wrap>
@ -56,7 +57,8 @@
</el-space>
</el-descriptions-item>
<el-descriptions-item label-align="center" label="检查状态" :span="2" label-class-name="white">
<el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.inspectionStatus)" finish-status="finish">
<el-steps style="max-width: 200px" :active="Number(safetyInspectionDetail?.inspectionStatus)"
finish-status="finish">
<el-step v-for="item in quality_inspection_status_type" :key="item.value" :title="item.label" />
</el-steps>
</el-descriptions-item>
@ -66,11 +68,11 @@
</el-descriptions>
<el-descriptions :column="2" border label-width="160px" size="large">
<el-descriptions-item label-align="center" label="整改措施及完成情况" :span="2" label-class-name="white">
{{ safetyInspectionDetail?.verificationResult }}
{{ safetyInspectionDetail?.rectificationResult }}
</el-descriptions-item>
<el-descriptions-item label-align="center" label="整改附件" :span="2" label-class-name="white">
<el-space wrap>
<div v-for="item in rectificationFileList" :key="item.ossId">
<div v-for="item in safetyInspectionDetail?.rectificationImgFileList" :key="item.ossId">
<span v-if="['.png', '.jpg', '.jpeg'].includes(item.fileSuffix)">
<image-preview :src="item.url" width="200px" />
</span>
@ -87,8 +89,8 @@
<el-descriptions-item label-align="center" label="验证" class-name="none"></el-descriptions-item>
</el-descriptions>
<el-descriptions :column="2" border label-width="160px" size="large">
<el-descriptions-item label-align="center" label="验证结果" label-class-name="white"
>{{ safetyInspectionDetail?.verificationResult }}
<el-descriptions-item label-align="center" label="验证结果" label-class-name="white">{{
safetyInspectionDetail?.verificationResult }}
</el-descriptions-item>
</el-descriptions>
</div>
@ -140,14 +142,14 @@ const get = async () => {
if (res.data && res.code === 200) {
safetyInspectionDetail.value = res.data;
if (res.data.rectificationFileList) {
if (res.data.inspectionFile) {
const checkFileRes = await listByIds(res.data.inspectionFile.split(','));
checkFileList.value = checkFileRes.data;
}
if (res.data.rectificationFile) {
const rectificationFileRes = await listByIds(res.data.rectificationFile.split(','));
rectificationFileList.value = rectificationFileRes.data;
}
// if (res.data.rectificationImgFile) {
// const rectificationFileRes = await listByIds(res.data.rectificationFile.split(','));
// rectificationFileList.value = rectificationFileRes.data;
// }
}
};
@ -223,6 +225,7 @@ watch(
z-index: 10;
width: 105px;
height: 105px;
img {
width: 105px;
}

View File

@ -1,17 +1,20 @@
<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">
<el-form-item label="巡检类型" prop="inspectionType">
<el-select v-model="queryParams.inspectionType" placeholder="全部" clearable>
<el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value" />
<el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="工单状态" prop="inspectionStatus">
<el-select v-model="queryParams.inspectionStatus" placeholder="全部" clearable>
<el-option v-for="dict in quality_inspection_status_type" :key="dict.value" :label="dict.label" :value="dict.value" />
<el-option v-for="dict in quality_inspection_status_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
@ -27,7 +30,8 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['quality:qualityInspection:add']">新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['quality:qualityInspection:add']">新增</el-button>
</el-col>
<!-- <el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['quality:qualityInspection:edit']"
@ -35,18 +39,12 @@
>
</el-col> -->
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete()"
v-hasPermi="['quality:qualityInspection:remove']"
>删除</el-button
>
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
v-hasPermi="['quality:qualityInspection:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['quality:qualityInspection:export']">导出</el-button>
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['quality:qualityInspection:export']">导出</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -87,7 +85,7 @@
</el-table-column> -->
<el-table-column label="备注" align="center" prop="remark" />
<!-- <el-table-column label="创建者" align="center" prop="createBy" /> -->
<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="220">
<template #default="scope">
<!-- <el-tooltip content="验证" placement="top">
<el-button
@ -98,17 +96,29 @@
v-hasPermi="['quality:qualityInspection:edit']"
></el-button>
</el-tooltip> -->
<el-button link type="primary" icon="View" @click="handleDetail(scope.row)" v-hasPermi="['quality:qualityInspection:edit']">
<el-button link type="primary" icon="View" @click="handleDetail(scope.row)"
v-hasPermi="['quality:qualityInspection:edit']">
详情
</el-button>
<el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['quality:qualityInspection:remove']">
<el-button link type="success"
v-if="scope.row.inspectionStatus === '1' || scope.row.verificationType === '2'" icon="Pointer"
@click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:rectification']">
整改
</el-button>
<el-button link type="warning" icon="SuccessFilled" v-if="scope.row.inspectionStatus === '2'"
@click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:review']">
复查
</el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['quality:qualityInspection:remove']">
删除
</el-button>
</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="700px" append-to-body>
@ -121,23 +131,20 @@
</el-form-item>
<el-form-item label="巡检类型" prop="inspectionType">
<el-select v-model="form.inspectionType" placeholder="请选择巡检类型">
<el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
<el-option v-for="dict in quality_inspection_check_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="整改单位" prop="rectificationUnit">
<el-select v-model="form.rectificationUnit" placeholder="请选择整改单位">
<el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
<el-option v-for="dict in rectification_unit_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="所在班组" prop="teamId">
<el-select v-model="form.teamId" placeholder="请选择所在班组">
<el-option
v-for="dict in teamOpt"
:key="dict.value"
:label="dict.label"
:value="dict.value"
@click="changeForeman(dict.value)"
></el-option>
<el-option v-for="dict in teamOpt" :key="dict.value" :label="dict.label" :value="dict.value"
@click="changeForeman(dict.value)"></el-option>
</el-select>
</el-form-item>
<el-form-item label="整改人" prop="corrector">
@ -167,7 +174,30 @@
</template>
</el-dialog>
<el-dialog title="质量工单详情" v-model="dialog.details" width="60vw">
<quality-inspection-detail :quality-inspection-detail-id="currentId" />
<quality-inspection-detail :qualityInspectionDetailId="currentId" />
</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="rectificationResult" v-if="handleType === 'rectification'">
<el-input v-model="handleForm.rectificationResult" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="整改附件" prop="rectificationFile" v-if="handleType === 'rectification'">
<image-upload v-model="handleForm.qualityInspection" />
</el-form-item>
<el-form-item label="验证结果" prop="review" v-if="handleType === 'review'">
<el-input v-model="handleForm.verificationResult" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="验证类型" prop="reviewType" v-if="handleType === 'review'">
<el-select v-model="handleForm.verificationType" 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>
@ -175,6 +205,7 @@
<script setup name="QualityInspection" lang="ts">
import { listProjectTeamForeman } from '@/api/project/projectTeam';
import { foremanQuery, ProjectTeamForemanResp } from '@/api/project/projectTeam/types';
import { dayjs } from 'element-plus';
import {
listQualityInspection,
@ -187,8 +218,8 @@ import { QualityInspectionVO, QualityInspectionQuery, QualityInspectionForm } fr
import { useUserStoreHook } from '@/store/modules/user';
import QualityInspectionDetail from './component/qualityInspectionDetail.vue';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const { quality_inspection_check_type, quality_inspection_status_type, rectification_unit_type } = toRefs<any>(
proxy?.useDict('quality_inspection_check_type', 'quality_inspection_status_type', 'rectification_unit_type')
const { quality_inspection_check_type, quality_inspection_status_type, rectification_unit_type, review_type } = toRefs<any>(
proxy?.useDict('quality_inspection_check_type', 'quality_inspection_status_type', 'rectification_unit_type', 'review_type')
);
// 获取用户 store
const userStore = useUserStoreHook();
@ -202,6 +233,7 @@ const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const handleForm = ref({})
const isReply_type = ref([
{
label: '是',
@ -215,12 +247,13 @@ const isReply_type = ref([
const queryFormRef = ref<ElFormInstance>();
const qualityInspectionFormRef = ref<ElFormInstance>();
const handleDialogVisible = ref(false)
const dialog = reactive<DialogOption>({
visible: false,
details: false,
title: ''
});
const handleType = ref("")
const initFormData: QualityInspectionForm = {
id: undefined,
@ -285,7 +318,39 @@ const getList = async () => {
}));
loading.value = false;
};
const handleSubmit = async () => {
let flag = false;
if (handleType.value == "rectification") {
handleForm.value.inspectionStatus = "2";
handleForm.value.rectificationTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
const { code } = await updateQualityInspection(handleForm.value)
if (code == 200) flag = true
} else {
handleForm.value.inspectionStatus = "3";
handleForm.value.verificationTime = dayjs(new Date()).format("YYYY-MM-DD HH:mm:ss");
const { code } = await updateQualityInspection(handleForm.value)
if (code == 200) flag = true
}
if (flag) {
ElMessage.success("处理成功")
handleDialogVisible.value = false;
getList()
reset()
} else {
ElMessage.error("处理失败")
}
}
const handleDialog = (row) => {
handleForm.value = {};
if (row.inspectionStatus == '1') {
handleType.value = "rectification"
} else {
handleType.value = "review"
}
handleForm.value.id = row.id;
handleDialogVisible.value = true;
};
const changeForeman = (value: string) => {
const team = teamList.value.filter((team) => team.id === value)[0];
foremanOpt.value = team.foremanList?.map((foreman: foremanQuery) => ({

View File

@ -104,8 +104,8 @@
v-hasPermi="['safety:safetyInspection:query']">
详情
</el-button>
<el-button link type="success" v-if="scope.row.status === '1'" icon="Pointer"
@click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:rectification']">
<el-button link type="success" v-if="scope.row.status === '1' || scope.row.reviewType === '2'"
icon="Pointer" @click="handleDialog(scope.row)" v-hasPermi="['safety:safetyInspection:rectification']">
整改
</el-button>
<el-button link type="warning" icon="SuccessFilled" v-if="scope.row.status === '2'"

View File

@ -1,11 +1,13 @@
<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">
<el-form-item label="发生日期" prop="dateOfOccurrence">
<el-date-picker clearable v-model="queryParams.dateOfOccurrence" type="date" value-format="YYYY-MM-DD" placeholder="请选择发生日期" />
<el-date-picker clearable v-model="queryParams.dateOfOccurrence" type="date" value-format="YYYY-MM-DD"
placeholder="请选择发生日期" />
</el-form-item>
<el-form-item label="录入人" prop="creatorName">
<el-input clearable v-model="queryParams.creatorName" placeholder="请输入录入人" />
@ -23,15 +25,18 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyLog:add']">新增 </el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['safety:safetyLog:add']">1
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['safety:safetyLog:remove']">
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()"
v-hasPermi="['safety:safetyLog:remove']">
批量删除
</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['safety:safetyLog:export']">导出 </el-button>
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['safety:safetyLog:export']">导出 </el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -56,23 +61,27 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">
<el-space>
<el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)" v-hasPermi="['safety:safetyLog:query']">
<el-button link type="primary" icon="View" @click="handleShowDialog(scope.row)"
v-hasPermi="['safety:safetyLog:query']">
详情
</el-button>
<!-- <el-button link type="success" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['safety:safetyLog:edit']"> 修改 </el-button> -->
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['safety:safetyLog:remove']"> 删除 </el-button>
<el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)"
v-hasPermi="['safety:safetyLog:remove']"> 删除 </el-button>
</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="950px" append-to-body>
<el-form ref="safetyLogFormRef" :model="form" :rules="rules" label-width="250px">
<el-form-item label="发生日期" prop="dateOfOccurrence">
<el-date-picker clearable v-model="form.dateOfOccurrence" type="date" value-format="YYYY-MM-DD" placeholder="请选择发生日期">
<el-date-picker clearable v-model="form.dateOfOccurrence" type="date" value-format="YYYY-MM-DD"
placeholder="请选择发生日期">
</el-date-picker>
</el-form-item>
<el-form-item label="最高气温" prop="airTemperatureMax">
@ -83,7 +92,8 @@
</el-form-item>
<el-form-item label="气候" prop="weather">
<el-select v-model="form.weather" placeholder="请选择气候">
<el-option v-for="dict in weather_type" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
<el-option v-for="dict in weather_type" :key="dict.value" :label="dict.label"
:value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="工程施工部位及施工进展情况" prop="progress">
@ -204,6 +214,7 @@ const data = reactive<PageData<SafetyLogForm, SafetyLogQuery>>({
otherCondition: undefined,
remark: undefined,
creatorName: undefined,
params: {}
},
rules: {

View File

@ -94,7 +94,7 @@
<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-tooltip content="整改" placement="top" v-if="scope.row.status === '1' || scope.row.reviewType === '2'">
<el-button link type="success" icon="Pointer" @click="handleDialog(scope.row)"
v-hasPermi="['safety:violationRecord:rectification']">整改</el-button>
</el-tooltip>