Skip to content

H
huaxin-rq
Commit 4512bcb2 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

隐患审核记录

parent 8adda220
Hide whitespace changes
Inline Side-by-side
Showing with 205 additions and 95 deletions
huaxin-admin/src/main/java/com/zehong/web/controller/checktask/TDangerApprovalRecordController.java
View file @ 4512bcb2
......@@ -45,6 +45,18 @@ public class TDangerApprovalRecordController extends BaseController
return getDataTable(list);
}
/**
* 获取所有隐患审核记录
* @param tDangerApprovalRecord 参数
* @return
*/
@GetMapping("/dangerApprovalListInfo")
public AjaxResult dangerApprovalListInfo(TDangerApprovalRecord tDangerApprovalRecord) {
List<TDangerApprovalRecord> list = tDangerApprovalRecordService.selectTDangerApprovalRecordList(tDangerApprovalRecord);
return AjaxResult.success(list);
}
/**
* 导出隐患审核记录列表
*/
......
huaxin-system/src/main/java/com/zehong/system/domain/TDangerApprovalRecord.java
View file @ 4512bcb2
......@@ -42,6 +42,8 @@ public class TDangerApprovalRecord extends BaseEntity
@Excel(name = "备注")
private String remarks;
private String nickName;
public void setApprovalId(Long approvalId)
{
this.approvalId = approvalId;
......@@ -106,6 +108,14 @@ public class TDangerApprovalRecord extends BaseEntity
return remarks;
}
public String getNickName() {
return nickName;
}
public void setNickName(String nickName) {
this.nickName = nickName;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
huaxin-system/src/main/resources/mapper/system/TDangerApprovalRecordMapper.xml
View file @ 4512bcb2
......@@ -18,24 +18,39 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTDangerApprovalRecordVo">
select approval_id, danger_id, user_id, approval_status, suggestion, create_time, update_by, update_time, is_del, remarks from t_danger_approval_record
SELECT
record.approval_id,
record.danger_id,
record.user_id,
record.approval_status,
record.suggestion,
record.create_time,
record.update_by,
record.update_time,
record.is_del,
record.remarks,
su.nick_name as nickName
FROM
t_danger_approval_record record
LEFT JOIN sys_user su ON su.user_id = record.user_id
</sql>
<select id="selectTDangerApprovalRecordList" parameterType="TDangerApprovalRecord" resultMap="TDangerApprovalRecordResult">
<include refid="selectTDangerApprovalRecordVo"/>
<where>
<if test="dangerId != null "> and danger_id = #{dangerId}</if>
<if test="userId != null "> and user_id = #{userId}</if>
<if test="approvalStatus != null and approvalStatus != ''"> and approval_status = #{approvalStatus}</if>
<if test="suggestion != null and suggestion != ''"> and suggestion = #{suggestion}</if>
<if test="isDel != null and isDel != ''"> and is_del = #{isDel}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
<if test="dangerId != null "> and record.danger_id = #{dangerId}</if>
<if test="userId != null "> and record.user_id = #{userId}</if>
<if test="approvalStatus != null and approvalStatus != ''"> and record.approval_status = #{approvalStatus}</if>
<if test="suggestion != null and suggestion != ''"> and record.suggestion = #{suggestion}</if>
<if test="isDel != null and isDel != ''"> and record.is_del = #{isDel}</if>
<if test="remarks != null and remarks != ''"> and record.remarks = #{remarks}</if>
</where>
ORDER BY record.create_time ASC
</select>
<select id="selectTDangerApprovalRecordById" parameterType="Long" resultMap="TDangerApprovalRecordResult">
<include refid="selectTDangerApprovalRecordVo"/>
where approval_id = #{approvalId}
where record.approval_id = #{approvalId}
</select>
<insert id="insertTDangerApprovalRecord" parameterType="TDangerApprovalRecord" useGeneratedKeys="true" keyProperty="approvalId">
......
huaxin-web/src/api/checktask/dangerApprovalRecord.js 0 → 100644
View file @ 4512bcb2
import request from '@/utils/request'
// 查询隐患审核记录列表
export function listRecord(query) {
return request({
url: '/danger/approval/list',
method: 'get',
params: query
})
}
// 查询隐患审核记录详细
export function getRecord(approvalId) {
return request({
url: '/danger/approval/' + approvalId,
method: 'get'
})
}
// 新增隐患审核记录
export function addRecord(data) {
return request({
url: '/danger/approval',
method: 'post',
data: data
})
}
// 修改隐患审核记录
export function updateRecord(data) {
return request({
url: '/danger/approval',
method: 'put',
data: data
})
}
// 删除隐患审核记录
export function delRecord(approvalId) {
return request({
url: '/danger/approval/' + approvalId,
method: 'delete'
})
}
// 导出隐患审核记录
export function exportRecord(query) {
return request({
url: '/danger/approval/export',
method: 'get',
params: query
})
}
//查询所有隐患审核记录
export function dangerApprovalListInfo(query) {
return request({
url: '/danger/approval/dangerApprovalListInfo',
method: 'get',
params: query
})
}
huaxin-web/src/views/checktask/danger/components/DangerDetail.vue
View file @ 4512bcb2
......@@ -349,12 +349,12 @@
</el-form>
</el-row>
<div class="t">复核信息</div>
<div class="t">复查信息</div>
<el-row class="container flex bb">
<el-form label-width="110px" class="el-table">
<el-col style="height: auto" :span="8">
<el-col :span="24">
<el-form-item label="复核人">
<el-form-item label="复查人">
<span v-if="dangerDetailInfo.checkName">{{
dangerDetailInfo.checkName
}}</span>
......@@ -362,7 +362,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="复核时间">
<el-form-item label="复查时间">
<span v-if="dangerDetailInfo.checkTime">{{
dangerDetailInfo.checkTime
}}</span>
......@@ -371,7 +371,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="复核备注">
<el-form-item label="复查备注">
<span v-if="dangerDetailInfo.checkRemark">{{
dangerDetailInfo.checkRemark
}}</span>
......@@ -382,7 +382,7 @@
<el-col :span="16">
<el-col :span="24">
<el-form-item label="复核图片" prop="checkImg">
<el-form-item label="复查图片" prop="checkImg">
<div>
<MyImage
v-if="dangerDetailInfo.checkImg"
......@@ -399,37 +399,28 @@
</el-row>
<!--<el-row class="container flex bb">
<el-form label-width="110px" class="el-table">
<el-col :span="24">
<el-col :span="4">
<el-form-item label="复核人">
<span v-if="dangerDetailInfo.checkName">{{
dangerDetailInfo.checkName
}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="复核时间">
<span v-if="dangerDetailInfo.checkTime">{{
dangerDetailInfo.checkTime
}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="14">
<el-form-item label="复核备注">
<span v-if="dangerDetailInfo.checkRemark">{{
dangerDetailInfo.checkRemark
}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-col>
<div class="t">审核信息</div>
<div class="container bb">
<el-form label-width="110px" class="el-table scroll" v-if="dangerApprovalList.length > 0">
<el-timeline >
<el-timeline-item
placement="top"
type="primary"
v-for="(activity, index) in dangerApprovalList"
:key="index"
:timestamp="activity.createTime">
<el-card>
<el-form-item label="审核人">{{activity.nickName}}</el-form-item>
<el-form-item label="审状态">
<span v-if="activity.approvalStatus == '0'">通过</span>
<span v-else>不通过</span>
</el-form-item>
<el-form-item label="审核意见">{{ activity.suggestion }}</el-form-item>
</el-card>
</el-timeline-item>
</el-timeline>
</el-form>
</el-row>-->
</div>
<div class="t">归档信息</div>
<el-row class="container flex bb">
......@@ -453,7 +444,7 @@
</el-col>
<!--<el-col :span="14">
<el-form-item label="复核备注">
<el-form-item label="复查备注">
<span v-if="dangerDetailInfo.checkRemark">{{
dangerDetailInfo.checkRemark
}}</span>
......@@ -670,11 +661,11 @@
</el-col>
</el-row>
<div style="font-size: 20px; margin: 7px 0px 7px 0px">复核信息</div>
<div style="font-size: 20px; margin: 7px 0px 7px 0px">复查信息</div>
<el-row>
<el-col :span="12">
<el-form-item label="复核人">
<el-form-item label="复查人">
<span v-if="dangerDetailInfo.checkName">{{
dangerDetailInfo.checkName
}}</span>
......@@ -682,7 +673,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="复核时间">
<el-form-item label="复查时间">
<span v-if="dangerDetailInfo.checkTime">{{
dangerDetailInfo.checkTime
}}</span>
......@@ -693,7 +684,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="复核备注">
<el-form-item label="复查备注">
<span v-if="dangerDetailInfo.checkRemark">{{
dangerDetailInfo.checkRemark
}}</span>
......@@ -763,6 +754,7 @@ import { getBusiness } from "@/api/baseinfo/businessInfo";
import CanyinRecordDetail from "@/views/checktask/inspect/jumInspect/cyRecordDetail";
import IndustryRecordDetail from "@/views/checktask/task/components/IndustryRecordDetail";
import { getTask } from "@/api/checktask/task";
import { dangerApprovalListInfo } from "@/api/checktask/dangerApprovalRecord";
export default {
name: "danger-detail",
components: {
......@@ -792,9 +784,9 @@ export default {
b: ["整改时间", "-"],
},
{
title: "待审核",
a: ["复核人", "-"],
b: ["复核时间", "-"],
title: "已复查审核中",
a: ["复查人", "-"],
b: ["复查时间", "-"],
},
{
title: "已归档",
......@@ -810,6 +802,7 @@ export default {
},
dangerStatusChangeList: [],
inspectDetailInfo: null,
dangerApprovalList: []
};
},
methods: {
......@@ -829,6 +822,8 @@ export default {
this.initMap();
this.statusChangeInfo(dangerId);
});
//获取审核记录
this.getDangerApprovalList(dangerId);
},
//地图初始化
initMap() {
......@@ -912,6 +907,14 @@ export default {
this.$refs.inspectDetail.detailInfo = res.data;
});
},
//获取审核记录
getDangerApprovalList(dangerId){
dangerApprovalListInfo({dangerId:dangerId}).then(res =>{
if(res.code == 200){
this.dangerApprovalList = res.data;
}
})
}
},
computed: {
...mapGetters(["systemSetting"]),
......@@ -994,4 +997,8 @@ export default {
width: 100%;
background-color: #f9f9f9;
}
.scroll{
height: 350px;
overflow-y: auto;
}
</style>
huaxin-web/src/views/checktask/task/components/DangerDetailInfo.vue
View file @ 4512bcb2
......@@ -7,7 +7,7 @@
<el-tab-pane
:label="danger.title"
v-for="(danger, arrIndex) in dangerList"
:key="danger.title"
:key="danger.id"
>
<div class="steps">
<MySteps
......@@ -317,12 +317,12 @@
</el-form>
</el-row>
<div class="t">复核信息</div>
<div class="t">复查信息</div>
<el-row class="container flex bb">
<el-form label-width="110px" class="el-table">
<el-col style="height: auto" :span="8">
<el-col :span="24">
<el-form-item label="复核人">
<el-form-item label="复查人">
<span v-if="dangerDetailInfo.checkName">{{
dangerDetailInfo.checkName
}}</span>
......@@ -330,7 +330,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="复核时间">
<el-form-item label="复查时间">
<span v-if="dangerDetailInfo.checkTime">{{
dangerDetailInfo.checkTime
}}</span>
......@@ -339,7 +339,7 @@
</el-col>
<el-col :span="24">
<el-form-item label="复核备注">
<el-form-item label="复查备注">
<span v-if="dangerDetailInfo.checkRemark">{{
dangerDetailInfo.checkRemark
}}</span>
......@@ -350,7 +350,7 @@
<el-col :span="16">
<el-col :span="24">
<el-form-item label="复核图片" prop="checkImg">
<el-form-item label="复查图片" prop="checkImg">
<div>
<MyImage
v-if="dangerDetailInfo.checkImg"
......@@ -366,37 +366,28 @@
</el-form>
</el-row>
<!--<el-row class="container flex bb">
<el-form label-width="110px" class="el-table">
<el-col :span="24">
<el-col :span="4">
<el-form-item label="复核人">
<span v-if="dangerDetailInfo.checkName">{{
dangerDetailInfo.checkName
}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="复核时间">
<span v-if="dangerDetailInfo.checkTime">{{
dangerDetailInfo.checkTime
}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="14">
<el-form-item label="备注">
<span v-if="dangerDetailInfo.checkRemark">{{
dangerDetailInfo.checkRemark
}}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-col>
<div class="t">审核信息</div>
<div class="container bb">
<el-form label-width="110px" class="el-table scroll" v-if="dangerApprovalList.length > 0">
<el-timeline >
<el-timeline-item
placement="top"
type="primary"
v-for="(activity, index) in dangerApprovalList"
:key="index"
:timestamp="activity.createTime">
<el-card>
<el-form-item label="审核人">{{activity.nickName}}</el-form-item>
<el-form-item label="审状态">
<span v-if="activity.approvalStatus == '0'">通过</span>
<span v-else>不通过</span>
</el-form-item>
<el-form-item label="审核意见">{{ activity.suggestion }}</el-form-item>
</el-card>
</el-timeline-item>
</el-timeline>
</el-form>
</el-row>-->
</div>
<div class="t">归档信息</div>
<el-row class="container flex bb">
......@@ -420,7 +411,7 @@
</el-col>
<!--<el-col :span="14">
<el-form-item label="复核备注">
<el-form-item label="复查备注">
<span v-if="dangerDetailInfo.checkRemark">{{
dangerDetailInfo.checkRemark
}}</span>
......@@ -625,12 +616,12 @@
</el-row> -->
<!-- <div style="font-size: 20px; margin: 7px 0px 7px 0px">
复核信息
复查信息
</div>
<el-row>
<el-col :span="12">
<el-form-item label="复核人">
<el-form-item label="复查人">
<span v-if="dangerDetailInfo.checkName">{{
dangerDetailInfo.checkName
}}</span>
......@@ -638,7 +629,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="复核时间">
<el-form-item label="复查时间">
<span v-if="dangerDetailInfo.checkTime">{{
dangerDetailInfo.checkTime
}}</span>
......@@ -649,7 +640,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="复核备注">
<el-form-item label="复查备注">
<span v-if="dangerDetailInfo.checkRemark">{{
dangerDetailInfo.checkRemark
}}</span>
......@@ -712,6 +703,7 @@ import { mapGetters } from "vuex";
import { dangerStatusList } from "@/api/checktask/dangerStatus";
import MySteps from "@/components/MySteps";
import MyImage from "@/components/MyImage/index.vue";
import { dangerApprovalListInfo } from "@/api/checktask/dangerApprovalRecord";
export default {
name: "danger-detail-info",
components: {
......@@ -743,9 +735,9 @@ export default {
b: ["整改时间", "-"],
},
{
title: "待审核",
a: ["复核人", "-"],
b: ["复核时间", "-"],
title: "已复查审核中",
a: ["复查人", "-"],
b: ["复查时间", "-"],
},
{
title: "已归档",
......@@ -766,6 +758,7 @@ export default {
index: 0,
dangerSource: [],
dangerStatusChangeList: [],
dangerApprovalList: []
};
},
methods: {
......@@ -835,6 +828,8 @@ export default {
//this.taskDetail();
this.statusChangeInfo(row.id);
});
//获取审核记录
this.getDangerApprovalList(row.id);
},
//地图初始化
initMap() {
......@@ -874,6 +869,14 @@ export default {
}
});
},
//获取审核记录
getDangerApprovalList(dangerId){
dangerApprovalListInfo({dangerId:dangerId}).then(res =>{
if(res.code == 200){
this.dangerApprovalList = res.data;
}
})
}
},
computed: {
...mapGetters(["systemSetting"]),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment