Skip to content

Z
zh-baseversion-project
Commit 15a4f614 authored by 耿迪迪's avatar 耿迪迪
Browse files
Options

检查记录隐患管理

parent 37def2d7
Hide whitespace changes
Inline Side-by-side
Showing with 800 additions and 11 deletions
zh-baseversion-system/src/main/java/com/zehong/system/domain/TInsRecInfor.java
View file @ 15a4f614
...@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle; ...@@ -5,6 +5,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
import com.zehong.common.annotation.Excel; import com.zehong.common.annotation.Excel;
import com.zehong.common.core.domain.BaseEntity; import com.zehong.common.core.domain.BaseEntity;
import java.util.List;
/** /**
* 监督检查-检查记录对象 t_ins_rec_infor * 监督检查-检查记录对象 t_ins_rec_infor
* *
...@@ -106,6 +108,11 @@ public class TInsRecInfor extends BaseEntity ...@@ -106,6 +108,11 @@ public class TInsRecInfor extends BaseEntity
private String taskName; private String taskName;
/**
* 隐患集合
*/
private List<TInsHazRef> rectificationList;
public void setfInsRecInforId(Long fInsRecInforId) public void setfInsRecInforId(Long fInsRecInforId)
{ {
...@@ -260,6 +267,14 @@ public class TInsRecInfor extends BaseEntity ...@@ -260,6 +267,14 @@ public class TInsRecInfor extends BaseEntity
this.taskName = taskName; this.taskName = taskName;
} }
public List<TInsHazRef> getRectificationList() {
return rectificationList;
}
public void setRectificationList(List<TInsHazRef> rectificationList) {
this.rectificationList = rectificationList;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
zh-baseversion-system/src/main/java/com/zehong/system/mapper/TInsHazRefMapper.java
View file @ 15a4f614
...@@ -58,4 +58,6 @@ public interface TInsHazRefMapper ...@@ -58,4 +58,6 @@ public interface TInsHazRefMapper
* @return 结果 * @return 结果
*/ */
public int deleteTInsHazRefByIds(Long[] fInsHazRefIds); public int deleteTInsHazRefByIds(Long[] fInsHazRefIds);
int deleteTInsHazRefByCheckCode(String fCheckCode);
} }
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TInsRecInforServiceImpl.java
View file @ 15a4f614
...@@ -6,8 +6,10 @@ import com.zehong.common.utils.GovernmentDataCopyUtil; ...@@ -6,8 +6,10 @@ import com.zehong.common.utils.GovernmentDataCopyUtil;
import com.zehong.common.utils.GovernmentDataUtil; import com.zehong.common.utils.GovernmentDataUtil;
import com.zehong.common.utils.StringUtils; import com.zehong.common.utils.StringUtils;
import com.zehong.system.domain.SysSetting; import com.zehong.system.domain.SysSetting;
import com.zehong.system.domain.TInsHazRef;
import com.zehong.system.domain.TInsRecInfor; import com.zehong.system.domain.TInsRecInfor;
import com.zehong.system.domain.vo.TInsRecInforVo; import com.zehong.system.domain.vo.TInsRecInforVo;
import com.zehong.system.mapper.TInsHazRefMapper;
import com.zehong.system.mapper.TInsRecInforMapper; import com.zehong.system.mapper.TInsRecInforMapper;
import com.zehong.system.service.ISysSettingService; import com.zehong.system.service.ISysSettingService;
import com.zehong.system.service.ITInsRecInforService; import com.zehong.system.service.ITInsRecInforService;
...@@ -16,8 +18,11 @@ import org.slf4j.Logger; ...@@ -16,8 +18,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.sql.SQLIntegrityConstraintViolationException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.Year; import java.time.Year;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -48,6 +53,9 @@ public class TInsRecInforServiceImpl implements ITInsRecInforService ...@@ -48,6 +53,9 @@ public class TInsRecInforServiceImpl implements ITInsRecInforService
@Resource @Resource
private ITSerialNumberInfoService itSerialNumberInfoService; private ITSerialNumberInfoService itSerialNumberInfoService;
@Resource
private TInsHazRefMapper tInsHazRefMapper;
/** /**
* 查询监督检查-检查记录 * 查询监督检查-检查记录
* *
...@@ -79,6 +87,7 @@ public class TInsRecInforServiceImpl implements ITInsRecInforService ...@@ -79,6 +87,7 @@ public class TInsRecInforServiceImpl implements ITInsRecInforService
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class)
public int insertTInsRecInfor(TInsRecInfor tInsRecInfor) public int insertTInsRecInfor(TInsRecInfor tInsRecInfor)
{ {
tInsRecInfor.setfLastUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); tInsRecInfor.setfLastUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
...@@ -87,6 +96,12 @@ public class TInsRecInforServiceImpl implements ITInsRecInforService ...@@ -87,6 +96,12 @@ public class TInsRecInforServiceImpl implements ITInsRecInforService
Map<String,String> num = itSerialNumberInfoService.getSerialNumberByTableType("t_ins_rec_infor"); Map<String,String> num = itSerialNumberInfoService.getSerialNumberByTableType("t_ins_rec_infor");
if(null == num || StringUtils.isEmpty(num.get("f_check_code"))) throw new CustomException("检查记录编码未配置！"); if(null == num || StringUtils.isEmpty(num.get("f_check_code"))) throw new CustomException("检查记录编码未配置！");
tInsRecInfor.setfCheckCode(code.getSystemValue()+ Year.now().getValue() + num.get("f_check_code")); tInsRecInfor.setfCheckCode(code.getSystemValue()+ Year.now().getValue() + num.get("f_check_code"));
if(!CollectionUtils.isEmpty(tInsRecInfor.getRectificationList())){
for(TInsHazRef ref : tInsRecInfor.getRectificationList()){
ref.setfCheckCode(tInsRecInfor.getfCheckCode());
addInsHazRef(ref);
}
}
return tInsRecInforMapper.insertTInsRecInfor(tInsRecInfor); return tInsRecInforMapper.insertTInsRecInfor(tInsRecInfor);
} }
...@@ -97,12 +112,42 @@ public class TInsRecInforServiceImpl implements ITInsRecInforService ...@@ -97,12 +112,42 @@ public class TInsRecInforServiceImpl implements ITInsRecInforService
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateTInsRecInfor(TInsRecInfor tInsRecInfor) @Transactional(rollbackFor = Exception.class)
{ public int updateTInsRecInfor(TInsRecInfor tInsRecInfor){
tInsRecInfor.setfLastUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); tInsRecInfor.setfLastUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
if(!CollectionUtils.isEmpty(tInsRecInfor.getRectificationList())){
tInsHazRefMapper.deleteTInsHazRefByCheckCode(tInsRecInfor.getfCheckCode());
for(TInsHazRef ref : tInsRecInfor.getRectificationList()){
ref.setfObjType(tInsRecInfor.getfObjectType());
ref.setfObjCode(tInsRecInfor.getfObjectCode());
ref.setfCheckCode(tInsRecInfor.getfCheckCode());
addInsHazRef(ref);
}
}
return tInsRecInforMapper.updateTInsRecInfor(tInsRecInfor); return tInsRecInforMapper.updateTInsRecInfor(tInsRecInfor);
} }
/**
* 新增隐患
* @param ref
*/
private void addInsHazRef(TInsHazRef ref){
try{
ref.setfLastTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
tInsHazRefMapper.insertTInsHazRef(ref);
}catch (Exception e){
Throwable cause = e.getCause();
if (cause instanceof SQLIntegrityConstraintViolationException){
String errMsg = cause.getMessage();
if (StringUtils.isNotEmpty(errMsg) && errMsg.contains("index_hazard_unique_code")){
throw new CustomException("隐患唯一编码不唯一");
}
}
throw new CustomException("隐患新增失败");
}
}
/** /**
* 批量删除监督检查-检查记录 * 批量删除监督检查-检查记录
* *
......
zh-baseversion-system/src/main/resources/mapper/system/TInsHazRefMapper.xml
View file @ 15a4f614
...@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="fRectificationStatus != null and fRectificationStatus != ''"> and f_rectification_status = #{fRectificationStatus}</if> <if test="fRectificationStatus != null and fRectificationStatus != ''"> and f_rectification_status = #{fRectificationStatus}</if>
<if test="fIsEnforcement != null and fIsEnforcement != ''"> and f_is_enforcement = #{fIsEnforcement}</if> <if test="fIsEnforcement != null and fIsEnforcement != ''"> and f_is_enforcement = #{fIsEnforcement}</if>
<if test="fEnforcementType != null and fEnforcementType != ''"> and f_enforcement_type = #{fEnforcementType}</if> <if test="fEnforcementType != null and fEnforcementType != ''"> and f_enforcement_type = #{fEnforcementType}</if>
<if test="fCheckCode != null and fCheckCode != ''"> and f_check_code = #{fCheckCode}</if>
</where> </where>
ORDER BY f_last_time DESC ORDER BY f_last_time DESC
</select> </select>
...@@ -147,4 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -147,4 +148,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{fInsHazRefId} #{fInsHazRefId}
</foreach> </foreach>
</delete> </delete>
<delete id="deleteTInsHazRefByCheckCode" parameterType="String">
delete from t_ins_haz_ref where f_check_code = #{fCheckCode}
</delete>
</mapper> </mapper>
\ No newline at end of file
zh-baseversion-web/src/api/regulation/info.js
View file @ 15a4f614
...@@ -70,4 +70,13 @@ export function importTemplate() { ...@@ -70,4 +70,13 @@ export function importTemplate() {
url: '/regulation/info/importTemplate', url: '/regulation/info/importTemplate',
method: 'get' method: 'get'
}) })
} }
\ No newline at end of file
// 查询企业所有信息
export function enterpriseListInfo(query) {
return request({
url: '/regulation/info/enterpriseInfoList',
method: 'get',
params: query
})
}
zh-baseversion-web/src/views/supervision/record/components/DetailInfo.vue
View file @ 15a4f614
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
<!-- 检查记录详情 --> <!-- 检查记录详情 -->
<InspectInfo v-if="detailOpen" :detailInfo="detailInfo"/> <InspectInfo v-if="detailOpen" :detailInfo="detailInfo"/>
<!-- 隐患管理 -->
<Rectification :fCheckCode="detailInfo.fCheckCode" :readOnly="true" v-if="detailOpen"/>
</el-dialog> </el-dialog>
</template> </template>
...@@ -11,6 +14,7 @@ ...@@ -11,6 +14,7 @@
<script> <script>
import { getInfor } from "@/api/supervision/record"; import { getInfor } from "@/api/supervision/record";
import InspectInfo from "./InspectInfo"; import InspectInfo from "./InspectInfo";
import Rectification from "./Rectification";
export default { export default {
name: "detail-info", name: "detail-info",
data(){ data(){
...@@ -23,6 +27,7 @@ ...@@ -23,6 +27,7 @@
}, },
components:{ components:{
InspectInfo, InspectInfo,
Rectification
}, },
methods:{ methods:{
getDetailInfo(id){ getDetailInfo(id){
......
zh-baseversion-web/src/views/supervision/record/components/InsRefDetailInfo.vue 0 → 100644
View file @ 15a4f614
<template>
<el-dialog title="详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-form label-width="150px">
<el-row class="el-row-table">
<el-col :span="12">
<el-form-item label="隐患唯一编码">
<span v-if="detailInfo.fHazardUniqueCode">{{ detailInfo.fHazardUniqueCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="自有编号">
<span v-if="detailInfo.fHazardOutUniqueCode">{{ detailInfo.fHazardOutUniqueCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查记录编码">
<span v-if="detailInfo.fCheckCode">{{ detailInfo.fCheckCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="涉及供气企业编码">
<span v-if="detailInfo.fInvolveEnterpriseCode">{{ detailInfo.fInvolveEnterpriseCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查对象分类">
<span v-if="detailInfo.fObjType">{{ $parent.fObjTypeFormat(detailInfo) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="对象编码">
<span v-if="detailInfo.fObjCode">{{ detailInfo.fObjCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="行政区县级行政区">
<span v-if="detailInfo.fObjBelongRegionId">{{ $parent.countyInfo.find(item =>item.fId = detailInfo.fObjBelongRegionId).fName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="监督检查时间">
<span v-if="detailInfo.fCheckTime">{{ detailInfo.fCheckTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患分类分级编码">
<span v-if="detailInfo.fHazardTypeLevelId">{{ detailInfo.fHazardTypeLevelId }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整改状态">
<span v-if="detailInfo.fRectificationStatus">{{ $parent.fRectificationStatusFormat(detailInfo) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整改资金/万元">
<span v-if="detailInfo.fRectificationFund">{{ detailInfo.fRectificationFund }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整改完成日期">
<span v-if="detailInfo.fCompletionDate">{{ detailInfo.fCompletionDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整改或管控措施描述">
<span v-if="detailInfo.fControlMeasure">{{ detailInfo.fControlMeasure }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患整改前照片">
<el-image
:src="detailInfo.fBeforePicture"
:preview-src-list="[detailInfo.fBeforePicture]"
v-if="detailInfo.fBeforePicture != '' && detailInfo.fBeforePicture != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患整改后照片">
<el-image
:src="detailInfo.fAfterPicture"
:preview-src-list="[detailInfo.fAfterPicture]"
v-if="detailInfo.fAfterPicture != '' && detailInfo.fAfterPicture != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否执行">
<span v-if="detailInfo.fIsEnforcement == '1'">是</span>
<span v-else-if="detailInfo.fIsEnforcement == '0'">否</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处罚措施">
<span v-if="detailInfo.fEnforcementType">{{ $parent.fEnforcementTypeFormat(detailInfo) }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处罚金额/万元">
<span v-if="detailInfo.fPenaltyAmount">{{ detailInfo.fPenaltyAmount }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="执法日期">
<span v-if="detailInfo.fPenaltyDate">{{ detailInfo.fPenaltyDate }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="其他执法情况说明">
<span v-if="detailInfo.fPenaltyDesc">{{ detailInfo.fPenaltyDesc }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="更新时间">
<span v-if="detailInfo.fLastTime">{{ detailInfo.fLastTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注">
<span v-if="detailInfo.fRemark">{{ detailInfo.fRemark }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
</template>
<script>
export default {
name: "ins-ref-detail-info",
data(){
return{
detailInfo: {
fDeleteFlag: 0
},
detailOpen: false
}
}
}
</script>
<style scoped>
</style>
zh-baseversion-web/src/views/supervision/record/components/Rectification.vue 0 → 100644
View file @ 15a4f614
<template>
<div>
<h3>隐患管理</h3>
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
style="margin-bottom: 10px"
@click="handleAddHidden"
v-if="!readOnly"
>新增隐患</el-button>
<el-table v-loading="loading" :data="refList">
<el-table-column label="隐患唯一编码" align="center" prop="fHazardUniqueCode" />
<el-table-column label="自有编号" align="center" prop="fHazardOutUniqueCode">
<template slot-scope="scope">
<span v-if="scope.row.fHazardOutUniqueCode">{{ scope.row.fHazardOutUniqueCode }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="检查对象分类" align="center" prop="fObjType" :formatter="fObjTypeFormat" />
<el-table-column label="监督检查时间" align="center" prop="fCheckTime" :show-overflow-tooltip="true"/>
<el-table-column label="整改状态" align="center" prop="fRectificationStatus">
<template slot-scope="scope">
<span v-if="scope.row.fRectificationStatus">{{ fRectificationStatusFormat(scope.row) }}</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="是否执行" align="center" prop="fIsEnforcement">
<template slot-scope="scope">
<span v-if="scope.row.fIsEnforcement == '1'">是</span>
<span v-else-if="scope.row.fIsEnforcement == '0'">否</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-document"
@click="handleDetail(scope.row)"
>详情</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
v-if="!readOnly && (('-2' == $store.state.user.enterpriseId && scope.row.fRectificationStatus == '0') || '-2' != $store.state.user.enterpriseId)"
@click="handleUpdate(scope)"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
v-if="!readOnly && (('-2' == $store.state.user.enterpriseId && scope.row.fRectificationStatus == '0') || '-2' != $store.state.user.enterpriseId)"
@click="handleDelete(scope)"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 隐患新增 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="150px">
<el-row class="el-row-table">
<el-col :span="12">
<el-form-item label="隐患分类分级编码" prop="fHazardTypeLevelId">
<el-input v-model="form.fHazardTypeLevelId" placeholder="请输入隐患分类分级编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患唯一编码" prop="fHazardUniqueCode">
<el-input v-model="form.fHazardUniqueCode" placeholder="请输入隐患唯一编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="自有编号" prop="fHazardOutUniqueCode">
<el-input v-model="form.fHazardOutUniqueCode" placeholder="请输入自有编号" />
</el-form-item>
</el-col>
<!--<el-col :span="12" v-if="form.fInsHazRefId">
<el-form-item label="检查记录编码" prop="fCheckCode">
<el-input disabled v-model="form.fCheckCode" placeholder="请输入检查记录编码" />
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="供气企业" prop="fInvolveEnterpriseCode">
<el-select
v-model="form.fInvolveEnterpriseCode"
placeholder="请选择供气企业"
style="width: 100%"
>
<el-option
v-for="enterprise in enterpriseList"
:key="enterprise.companyType"
:label="enterprise.enterpriseName"
:value="enterprise.companyType"
/>
</el-select>
</el-form-item>
</el-col>
<!--<el-col :span="12">
<el-form-item label="检查对象分类" prop="fObjType">
<el-select
v-model="form.fObjType"
placeholder="请选择检查对象分类"
style="width: 100%"
>
<el-option
v-for="dict in fObjTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="对象编码" prop="fObjCode">
<el-input v-model="form.fObjCode" placeholder="请输入对象编码" />
</el-form-item>
</el-col>-->
<el-col :span="12">
<el-form-item label="行政区县级行政区" prop="fObjBelongRegionId">
<el-select
v-model="form.fObjBelongRegionId"
placeholder="请选择县级行政区"
style="width: 100%"
>
<el-option
v-for="county in countyInfo"
:key="county.fId"
:label="county.fName.trim()"
:value="county.fId"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="监督检查时间" prop="fCheckTime">
<el-date-picker
style="width: 100%"
v-model="form.fCheckTime"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择监督检查时间">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整改状态" prop="fRectificationStatus">
<el-select
v-model="form.fRectificationStatus"
placeholder="请选择整改状态"
style="width: 100%"
>
<el-option
v-for="dict in fRectificationStatusOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整改资金/万元" prop="fRectificationFund">
<el-input type="number" v-model="form.fRectificationFund" placeholder="请输入整改资金" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="整改完成日期" prop="fCompletionDate">
<el-date-picker
style="width: 100%"
v-model="form.fCompletionDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择整改完成日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="整改或管控措施描述" prop="fControlMeasure">
<el-input type="textarea" v-model="form.fControlMeasure" placeholder="请输入整改或管控措施描述" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患整改前照片">
<imageUpload v-model="form.fBeforePicture"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="隐患整改后照片">
<imageUpload v-model="form.fAfterPicture"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否执行" prop="fIsEnforcement">
<el-select
v-model="form.fIsEnforcement"
placeholder="请选择是否执行"
@change="isEnforcement"
style="width: 100%"
>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="form.fIsEnforcement == '1'">
<el-form-item label="处罚措施" prop="fEnforcementType">
<el-select
v-model="form.fEnforcementType"
placeholder="请选择处罚措施"
style="width: 100%"
>
<el-option
v-for="dict in fEnforcementTypeOptions"
:key="dict.dictValue"
:label="dict.dictLabel"
:value="dict.dictValue"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="处罚金额/万元" prop="fPenaltyAmount" v-if="form.fIsEnforcement == '1'">
<el-input type="number" v-model="form.fPenaltyAmount" placeholder="请输入处罚金额/万元" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="执法日期" prop="fPenaltyDate" v-if="form.fIsEnforcement == '1'">
<el-date-picker
style="width: 100%"
v-model="form.fPenaltyDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="选择执法日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="其他执法情况说明" prop="fPenaltyDesc" v-if="form.fIsEnforcement == '1'">
<el-input type="textarea" v-model="form.fPenaltyDesc" placeholder="请输入其他执法情况说明" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<InsRefDetailInfo ref="insRefDetail"/>
</div>
</template>
<script>
import ImageUpload from '@/components/ImageUpload';
import { listRef, getRef, delRef } from "@/api/supervision/rectification";
import { getDefaultCountyList } from "@/api/area/county";
import { enterpriseListInfo } from "@/api/regulation/info";
import InsRefDetailInfo from "./InsRefDetailInfo";
export default {
name: "rectification",
props:{
readOnly:{
type: Boolean,
default: false
},
fCheckCode:{
type: String
}
},
components:{
ImageUpload,
InsRefDetailInfo
},
data(){
return{
title: "",
open: false,
form:{},
rules: {
fHazardUniqueCode:[
{ required: true, message: "隐患唯一编码不能为空", trigger: "blur" }
],
fCheckCode: [
{ required: true, message: "请选择检查记录编码", trigger: "change" }
],
fObjBelongRegionId: [
{ required: true, message: "对象所在行政区，县级行政区ID不能为空", trigger: "blur" }
],
fCheckTime: [
{ required: true, message: "监督检查时间不能为空", trigger: "blur" }
],
fHazardTypeLevelId: [
{ required: true, message: "隐患分类分级编码不能为空", trigger: "blur" }
],
},
fObjTypeOptions:[],
fRectificationStatusOptions:[],
fEnforcementTypeOptions:[],
loading: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
fCheckCode: null
},
refList:[],
total: 0,
countyInfo: [],
enterpriseList: [],
editIndex: -1
}
},
created(){
this.$parent.$parent.$parent.form.fHazardsNum = this.refList.length;
if(this.fCheckCode){
this.queryParams.fCheckCode = this.fCheckCode;
this.getList();
}
this.getDicts("t_type_code").then(response => {
this.fObjTypeOptions = response.data;
});
this.getDicts("t_rectification_status").then(response => {
this.fRectificationStatusOptions = response.data;
});
this.getDicts("t_enforcement_type").then(response => {
this.fEnforcementTypeOptions = response.data;
});
this.getCountyInfo();
},
methods:{
// 检查对象分类
fObjTypeFormat(row, column) {
return this.selectDictLabel(this.fObjTypeOptions, row.fObjCode);
},
// 整改状态
fRectificationStatusFormat(row, column) {
return this.selectDictLabel(this.fRectificationStatusOptions, row.fRectificationStatus);
},
// 处罚措施
fEnforcementTypeFormat(row, column) {
return this.selectDictLabel(this.fEnforcementTypeOptions, row.fEnforcementType);
},
handleAddHidden(){
this.reset();
this.editIndex = -1;
//this.getRecordList();
this.getCountyInfo();
this.getEnterpriseInfo();
this.open = true;
this.title = "添加隐患";
},
getList() {
this.loading = true;
listRef(this.queryParams).then(response => {
this.refList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 表单重置
reset() {
this.form = {
fInsHazRefId: null,
fHazardUniqueCode: null,
fHazardOutUniqueCode: null,
fCheckCode: null,
fInvolveEnterpriseCode: null,
fObjType: null,
fObjCode: null,
fObjBelongRegionId: null,
fCheckTime: null,
fHazardTypeLevelId: null,
fHazardDesc: null,
fRectificationStatus: '0',
fRectificationFund: null,
fCompletionDate: null,
fControlMeasure: null,
fBeforePicture: null,
fAfterPicture: null,
fIsEnforcement: null,
fEnforcementType: null,
fPenaltyAmount: null,
fPenaltyDesc: null,
fPenaltyDate: null,
fRemark: null,
fLastTime: null
};
this.resetForm("form");
},
submitForm(){
if(this.editIndex > -1){
this.refList[this.editIndex] = this.form;
}else{
this.form.fObjType = this.$parent.$parent.$parent.form.fObjectType;
this.form.fObjCode = this.$parent.$parent.$parent.form.fObjectCode;
this.refList.push(this.form);
}
this.$parent.$parent.$parent.form.rectificationList = this.refList;
this.$parent.$parent.$parent.form.fHazardsNum = this.refList.length;
this.open = false;
},
cancel(){
this.open = false;
this.reset();
},
handleUpdate(scope) {
this.editIndex = scope.$index;
this.reset();
this.form = this.refList[scope.$index];
this.getCountyInfo();
this.getEnterpriseInfo();
this.open = true;
this.title = "修改隐患";
},
/** 删除按钮操作 */
handleDelete(scope) {
let that = this;
// const fInsHazRefIds = row.fInsHazRefId || this.ids;
this.$confirm('是否确认删除隐患唯一编号为'+ scope.row.fHazardUniqueCode +'的数据?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
//return delRef(fInsHazRefIds);
// this.msgSuccess("删除成功");
that.refList.splice(scope.$index,1);
that.$parent.$parent.$parent.form.rectificationList = that.refList;
that.$parent.$parent.$parent.form.fHazardsNum = that.refList.length;
}).catch((e) => {});
},
isEnforcement(val){
if(val == '1'){
this.form.fEnforcementType = null;
this.form.fPenaltyAmount = null;
this.form.fPenaltyDate = null;
this.form.fPenaltyDesc = null;
}
},
//获取县级
getCountyInfo(){
getDefaultCountyList().then(res =>{
if(res.code == 200 && res.data){
this.countyInfo = res.data;
const fRegionCode = this.$parent.$parent.$parent.form.fRegionCode;
if(fRegionCode) this.form.fObjBelongRegionId = this.countyInfo.find(item => item.fCountyCode == fRegionCode).fId;
}
})
},
getEnterpriseInfo(){
enterpriseListInfo().then(res =>{
if(res.code == 200 && res.data){
this.enterpriseList = res.data;
}
})
},
//详情
handleDetail(row){
this.$refs.insRefDetail.detailInfo = row;
this.$refs.insRefDetail.detailOpen = true;
},
}
}
</script>
<style scoped>
</style>
zh-baseversion-web/src/views/supervision/record/index.vue
View file @ 15a4f614
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<el-table v-loading="loading" :data="inforList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="inforList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="检查记录编码" align="center" prop="fCheckCode" /> <el-table-column label="检查记录编码" align="center" prop="fCheckCode" width="150"/>
<el-table-column label="任务编码" align="center" prop="fCheckTaskCode" /> <el-table-column label="任务编码" align="center" prop="fCheckTaskCode" />
<el-table-column label="任务名称" align="center" prop="taskName"> <el-table-column label="任务名称" align="center" prop="taskName">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<el-table-column label="检查对象分类" align="center" prop="fObjectType"/> <el-table-column label="检查对象分类" align="center" prop="fObjectType"/>
<el-table-column label="对象编码" align="center" prop="fObjectCode" /> <el-table-column label="对象编码" align="center" prop="fObjectCode" />
<el-table-column label="检查人员姓名" align="center" prop="fCheckManName" /> <el-table-column label="检查人员姓名" align="center" prop="fCheckManName" />
<el-table-column label="检查人员联系电话" align="center" prop="fCheckManPhone"> <el-table-column label="检查人员联系电话" align="center" prop="fCheckManPhone" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.fCheckManPhone">{{ scope.row.fCheckManPhone }}</span> <span v-if="scope.row.fCheckManPhone">{{ scope.row.fCheckManPhone }}</span>
<span v-else>-</span> <span v-else>-</span>
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
/> />
<!-- 添加或修改检查记录对话框 --> <!-- 添加或修改检查记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="900px" append-to-body destroy-on-close :close-on-click-modal="false"> <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-form ref="form" :model="form" :rules="rules" label-width="130px"> <el-form ref="form" :model="form" :rules="rules" label-width="130px">
<el-row class="el-row-table"> <el-row class="el-row-table">
<el-col :span="12"> <el-col :span="12">
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
<el-option <el-option
v-for="task in taskData" v-for="task in taskData"
:key="task.fInsTaskInforId" :key="task.fInsTaskInforId"
:label="task.fName + ' ' +task.fUniqueCode" :label="task.fName + ' + ' +task.fUniqueCode"
:value="task.fUniqueCode" :value="task.fUniqueCode"
/> />
</el-select> </el-select>
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="隐患数量" prop="fHazardsNum"> <el-form-item label="隐患数量" prop="fHazardsNum">
<el-input v-model="form.fHazardsNum" type="number" placeholder="请输入隐患数量" /> <el-input disabled v-model="form.fHazardsNum" type="number" placeholder="请输入隐患数量" />
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -298,14 +298,17 @@ ...@@ -298,14 +298,17 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <!--<el-col :span="24">
<el-form-item label="描述" prop="fRemark"> <el-form-item label="描述" prop="fRemark">
<el-input type="textarea" v-model="form.fRemark" placeholder="请输入描述" /> <el-input type="textarea" v-model="form.fRemark" placeholder="请输入描述" />
</el-form-item> </el-form-item>
</el-col> </el-col>-->
</el-row> </el-row>
<!-- 隐患管理 -->
<Rectification :fCheckCode="form.fCheckCode" v-if="open"/>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" @click="submitForm">确 定</el-button>
...@@ -329,12 +332,14 @@ import DetailInfo from "./components/DetailInfo"; ...@@ -329,12 +332,14 @@ import DetailInfo from "./components/DetailInfo";
import { getDefaultCountyList } from "@/api/area/county"; import { getDefaultCountyList } from "@/api/area/county";
import { getInspectionUsers } from "@/api/system/user"; import { getInspectionUsers } from "@/api/system/user";
import TaskInfo from "./components/TaskInfo"; import TaskInfo from "./components/TaskInfo";
import Rectification from "./components/Rectification";
export default { export default {
name: "Infor", name: "Infor",
components: { components: {
ImageUpload, ImageUpload,
DetailInfo, DetailInfo,
TaskInfo TaskInfo,
Rectification
}, },
data() { data() {
return { return {
......
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