feat(安全巡检): 添加整改单位名称字段并优化详情对话框显示
在安全巡检类型中新增整改单位名称字段,用于记录整改责任单位。同时优化安全巡检详情对话框的显示: 1. 为整改期限添加空值判断 2. 调整部分字段的显示格式 3. 修复班组字段显示错误问题
This commit is contained in:
@ -1,4 +1,9 @@
|
|||||||
export interface SafetyInspectionVO {
|
export interface SafetyInspectionVO {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 整改单位名称
|
||||||
|
*/
|
||||||
|
rectificationName: string;
|
||||||
/**
|
/**
|
||||||
* 主键ID
|
* 主键ID
|
||||||
*/
|
*/
|
||||||
|
|||||||
@ -2,35 +2,41 @@
|
|||||||
<!-- <el-card v-loading="loading" body-class="printMe"> -->
|
<!-- <el-card v-loading="loading" body-class="printMe"> -->
|
||||||
<div class="w75% m-a">
|
<div class="w75% m-a">
|
||||||
<div id="printMe" class="pos-relative">
|
<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>
|
<h2 style="text-align: center; margin-top: 5px; font-weight: bold">安全生产监督检查通知书</h2>
|
||||||
<el-row>
|
<el-row>
|
||||||
<el-col :span="12" style="text-align: left">填报人:{{ safetyInspectionDetail?.creatorName }}</el-col>
|
<el-col :span="12" style="text-align: left">填报人:{{ safetyInspectionDetail?.creatorName }}</el-col>
|
||||||
<el-col :span="12" style="text-align: right">填报时间:{{ safetyInspectionDetail?.createTime }}</el-col>
|
<el-col :span="12" style="text-align: right">填报时间:{{ safetyInspectionDetail?.createTime }}</el-col>
|
||||||
</el-row>
|
</el-row>
|
||||||
<el-descriptions :column="2" border style="margin-top: 8px" label-width="160px" size="large">
|
<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">{{ currentProject?.name }} </el-descriptions-item>
|
<el-descriptions-item label-align="center" label="检查项目" :span="2" class-name="zebra">{{ currentProject?.name }}
|
||||||
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label-align="center" label="检查类型" label-class-name="white">
|
<el-descriptions-item label-align="center" label="检查类型" label-class-name="white">
|
||||||
<dict-tag :options="safety_inspection_check_type" :value="safetyInspectionDetail?.checkType" />
|
<dict-tag :options="safety_inspection_check_type" :value="safetyInspectionDetail?.checkType" />
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label-align="center" label="违章类型" label-class-name="white">
|
<el-descriptions-item label-align="center" label="违章类型" label-class-name="white">
|
||||||
<dict-tag :options="safety_inspection_violation_type" :value="safetyInspectionDetail?.violationType" />
|
<dict-tag :options="safety_inspection_violation_type" :value="safetyInspectionDetail?.violationType" />
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label-align="center" label="检查时间" class-name="zebra">{{ safetyInspectionDetail?.checkTime }} </el-descriptions-item>
|
<el-descriptions-item label-align="center" label="检查时间" class-name="zebra">{{ safetyInspectionDetail?.checkTime
|
||||||
<el-descriptions-item label-align="center" label="检查人" class-name="zebra">{{ safetyInspectionDetail?.creatorName }} </el-descriptions-item>
|
}} </el-descriptions-item>
|
||||||
<el-descriptions-item label-align="center" label="整改人" label-class-name="white"
|
<el-descriptions-item label-align="center" label="检查人" class-name="zebra">{{ safetyInspectionDetail?.creatorName
|
||||||
>{{ safetyInspectionDetail?.correctorName }}
|
}} </el-descriptions-item>
|
||||||
|
<el-descriptions-item label-align="center" label="整改人" label-class-name="white">{{
|
||||||
|
safetyInspectionDetail?.correctorName }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
|
<el-descriptions-item label-align="center" label="要求整改期限" label-class-name="white">
|
||||||
{{ dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}
|
<span v-if="safetyInspectionDetail?.rectificationDeadline">{{
|
||||||
|
dayjs(safetyInspectionDetail?.rectificationDeadline).format('YYYY 年 MM 月 DD 日') }}</span>
|
||||||
|
<span v-else></span>
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions border direction="vertical" size="large">
|
<el-descriptions border direction="vertical" size="large">
|
||||||
<el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
|
<el-descriptions-item label-align="center" label="巡检结果" class-name="none"></el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions :column="2" border label-width="160px" size="large">
|
<el-descriptions :column="2" border label-width="160px" size="large">
|
||||||
<el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white"
|
<el-descriptions-item label-align="center" label="内容" :span="2" label-class-name="white">{{
|
||||||
>{{ safetyInspectionDetail?.hiddenDanger }}
|
safetyInspectionDetail?.hiddenDanger }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
|
<el-descriptions-item label-align="center" label="检查附件" :span="2" label-class-name="white">
|
||||||
<el-space wrap>
|
<el-space wrap>
|
||||||
@ -56,11 +62,11 @@
|
|||||||
<el-descriptions-item label-align="center" label="整改情况" class-name="none"></el-descriptions-item>
|
<el-descriptions-item label-align="center" label="整改情况" class-name="none"></el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions :column="2" border label-width="160px" size="large">
|
<el-descriptions :column="2" border label-width="160px" size="large">
|
||||||
<el-descriptions-item label-align="center" label="班组" label-class-name="white"
|
<el-descriptions-item label-align="center" label="班组" label-class-name="white">{{
|
||||||
>{{ safetyInspectionDetail?.teamName }}
|
safetyInspectionDetail?.rectificationName }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label-align="center" label="整改日期" label-class-name="white"
|
<el-descriptions-item label-align="center" label="整改日期" label-class-name="white">{{
|
||||||
>{{ safetyInspectionDetail?.rectificationTime }}
|
safetyInspectionDetail?.rectificationTime }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label-align="center" label="整改措施及完成情况" :span="2" label-class-name="white">
|
<el-descriptions-item label-align="center" label="整改措施及完成情况" :span="2" label-class-name="white">
|
||||||
{{ safetyInspectionDetail?.measure }}
|
{{ safetyInspectionDetail?.measure }}
|
||||||
@ -84,14 +90,14 @@
|
|||||||
<el-descriptions-item label-align="center" label="复查结果" class-name="none"></el-descriptions-item>
|
<el-descriptions-item label-align="center" label="复查结果" class-name="none"></el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
<el-descriptions :column="2" border label-width="160px" size="large">
|
<el-descriptions :column="2" border label-width="160px" size="large">
|
||||||
<el-descriptions-item label-align="center" label="复查人" label-class-name="white"
|
<el-descriptions-item label-align="center" label="复查人" label-class-name="white">{{
|
||||||
>{{ safetyInspectionDetail?.creatorName }}
|
safetyInspectionDetail?.creatorName }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label-align="center" label="复查日期" label-class-name="white"
|
<el-descriptions-item label-align="center" label="复查日期" label-class-name="white">{{
|
||||||
>{{ safetyInspectionDetail?.reviewTime }}
|
safetyInspectionDetail?.reviewTime }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white"
|
<el-descriptions-item label-align="center" label="复查情况" :span="2" label-class-name="white">{{
|
||||||
>{{ safetyInspectionDetail?.review }}
|
safetyInspectionDetail?.review }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
</div>
|
</div>
|
||||||
@ -236,6 +242,7 @@ watch(
|
|||||||
z-index: 10;
|
z-index: 10;
|
||||||
width: 105px;
|
width: 105px;
|
||||||
height: 105px;
|
height: 105px;
|
||||||
|
|
||||||
img {
|
img {
|
||||||
width: 105px;
|
width: 105px;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user