Skip to content

Z
zh-baseversion-project
Commit 4d41d425 authored by wanghao's avatar wanghao
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents f668d281 37def2d7
Hide whitespace changes
Inline Side-by-side
Showing with 435 additions and 166 deletions
zh-baseversion-admin/src/main/java/com/zehong/web/controller/area/TCountyLevelRegionController.java
View file @ 4d41d425
package com.zehong.web.controller.area; package com.zehong.web.controller.area;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.zehong.common.annotation.Log; import com.zehong.common.annotation.Log;
import com.zehong.common.core.controller.BaseController; import com.zehong.common.core.controller.BaseController;
import com.zehong.common.core.domain.AjaxResult; import com.zehong.common.core.domain.AjaxResult;
import com.zehong.common.core.page.TableDataInfo;
import com.zehong.common.enums.BusinessType; import com.zehong.common.enums.BusinessType;
import com.zehong.common.utils.poi.ExcelUtil;
import com.zehong.system.domain.TCountyLevelRegion; import com.zehong.system.domain.TCountyLevelRegion;
import com.zehong.system.service.ITCountyLevelRegionService; import com.zehong.system.service.ITCountyLevelRegionService;
import com.zehong.common.utils.poi.ExcelUtil; import org.springframework.beans.factory.annotation.Autowired;
import com.zehong.common.core.page.TableDataInfo; import org.springframework.web.bind.annotation.*;
import java.util.List;
/** /**
* 县级行政区Controller * 县级行政区Controller
...@@ -94,4 +87,13 @@ public class TCountyLevelRegionController extends BaseController ...@@ -94,4 +87,13 @@ public class TCountyLevelRegionController extends BaseController
{ {
return toAjax(tCountyLevelRegionService.deleteTCountyLevelRegionByIds(fIds)); return toAjax(tCountyLevelRegionService.deleteTCountyLevelRegionByIds(fIds));
} }
/**
* 获取系统设置县
* @return
*/
@GetMapping("/getDefaultCountyList")
public AjaxResult getDefaultCountyList(){
return AjaxResult.success(tCountyLevelRegionService.getDefaultCountyList());
}
} }
zh-baseversion-admin/src/main/java/com/zehong/web/controller/system/SysUserController.java
View file @ 4d41d425
...@@ -202,7 +202,7 @@ public class SysUserController extends BaseController ...@@ -202,7 +202,7 @@ public class SysUserController extends BaseController
* @return 巡线员信息 * @return 巡线员信息
*/ */
@GetMapping("/getInspectionUsers") @GetMapping("/getInspectionUsers")
public AjaxResult getInspectionUsers(@RequestParam(value = "enterpriseId") String enterpriseId, @RequestParam(value="postCode") String postCode){ public AjaxResult getInspectionUsers(@RequestParam(value = "enterpriseId") String enterpriseId, @RequestParam(value="postCode",required = false) String postCode){
Map<String,String> map = new HashMap<>(); Map<String,String> map = new HashMap<>();
map.put("enterpriseId",enterpriseId); map.put("enterpriseId",enterpriseId);
map.put("postCode",postCode); map.put("postCode",postCode);
......
zh-baseversion-system/src/main/java/com/zehong/system/domain/TInsRecInfor.java
View file @ 4d41d425
...@@ -33,9 +33,11 @@ public class TInsRecInfor extends BaseEntity ...@@ -33,9 +33,11 @@ public class TInsRecInfor extends BaseEntity
private String fCheckTaskCode; private String fCheckTaskCode;
/** 县级行政区ID */ /** 县级行政区ID */
@Excel(name = "县级行政区ID")
private String fRegionCode; private String fRegionCode;
@Excel(name = "县级行政区")
private String countyName;
/** 检查对象分类，按分类代码表23 分类填写 /** 检查对象分类，按分类代码表23 分类填写
23-0100 ：气代煤 23-0100 ：气代煤
...@@ -102,6 +104,9 @@ public class TInsRecInfor extends BaseEntity ...@@ -102,6 +104,9 @@ public class TInsRecInfor extends BaseEntity
@Excel(name = "描述") @Excel(name = "描述")
private String fRemark; private String fRemark;
private String taskName;
public void setfInsRecInforId(Long fInsRecInforId) public void setfInsRecInforId(Long fInsRecInforId)
{ {
this.fInsRecInforId = fInsRecInforId; this.fInsRecInforId = fInsRecInforId;
...@@ -138,7 +143,16 @@ public class TInsRecInfor extends BaseEntity ...@@ -138,7 +143,16 @@ public class TInsRecInfor extends BaseEntity
{ {
return fRegionCode; return fRegionCode;
} }
public void setfObjectType(String fObjectType)
public String getCountyName() {
return countyName;
}
public void setCountyName(String countyName) {
this.countyName = countyName;
}
public void setfObjectType(String fObjectType)
{ {
this.fObjectType = fObjectType; this.fObjectType = fObjectType;
} }
...@@ -238,6 +252,14 @@ public class TInsRecInfor extends BaseEntity ...@@ -238,6 +252,14 @@ public class TInsRecInfor extends BaseEntity
return fRemark; return fRemark;
} }
public String getTaskName() {
return taskName;
}
public void setTaskName(String taskName) {
this.taskName = taskName;
}
@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/service/ITCountyLevelRegionService.java
View file @ 4d41d425
...@@ -58,4 +58,10 @@ public interface ITCountyLevelRegionService ...@@ -58,4 +58,10 @@ public interface ITCountyLevelRegionService
* @return 结果 * @return 结果
*/ */
public int deleteTCountyLevelRegionById(Long fId); public int deleteTCountyLevelRegionById(Long fId);
/**
* 获取系统设置县
* @return
*/
List<TCountyLevelRegion> getDefaultCountyList();
} }
zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TCountyLevelRegionServiceImpl.java
View file @ 4d41d425
package com.zehong.system.service.impl; package com.zehong.system.service.impl;
import java.util.List; import java.util.List;
import com.zehong.common.exception.CustomException;
import com.zehong.common.utils.StringUtils;
import com.zehong.system.domain.SysSetting;
import com.zehong.system.service.ISysSettingService;
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 com.zehong.system.mapper.TCountyLevelRegionMapper; import com.zehong.system.mapper.TCountyLevelRegionMapper;
import com.zehong.system.domain.TCountyLevelRegion; import com.zehong.system.domain.TCountyLevelRegion;
import com.zehong.system.service.ITCountyLevelRegionService; import com.zehong.system.service.ITCountyLevelRegionService;
import javax.annotation.Resource;
/** /**
* 县级行政区Service业务层处理 * 县级行政区Service业务层处理
* *
...@@ -19,6 +26,9 @@ public class TCountyLevelRegionServiceImpl implements ITCountyLevelRegionService ...@@ -19,6 +26,9 @@ public class TCountyLevelRegionServiceImpl implements ITCountyLevelRegionService
@Autowired @Autowired
private TCountyLevelRegionMapper tCountyLevelRegionMapper; private TCountyLevelRegionMapper tCountyLevelRegionMapper;
@Resource
private ISysSettingService sysSettingService;
/** /**
* 查询县级行政区 * 查询县级行政区
* *
...@@ -90,4 +100,16 @@ public class TCountyLevelRegionServiceImpl implements ITCountyLevelRegionService ...@@ -90,4 +100,16 @@ public class TCountyLevelRegionServiceImpl implements ITCountyLevelRegionService
{ {
return tCountyLevelRegionMapper.deleteTCountyLevelRegionById(fId); return tCountyLevelRegionMapper.deleteTCountyLevelRegionById(fId);
} }
/**
* 获取系统设置县
* @return
*/
@Override
public List<TCountyLevelRegion> getDefaultCountyList() {
SysSetting code = sysSettingService.getSystemValueByKey("city_id");
if(null == code || StringUtils.isEmpty(code.getSystemValue())) throw new CustomException("市级行政编码未配置！");
return tCountyLevelRegionMapper.queryByCityId(code.getSystemValue());
}
} }
zh-baseversion-system/src/main/resources/mapper/system/TCountyLevelRegionMapper.xml
View file @ 4d41d425
...@@ -10,11 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -10,11 +10,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="fCountyCode" column="f_county_code" /> <result property="fCountyCode" column="f_county_code" />
<result property="fName" column="f_name" /> <result property="fName" column="f_name" />
<result property="fIsMajor" column="f_is_major" /> <result property="fIsMajor" column="f_is_major" />
<result property="seq" column="f_sql" /> <result property="seq" column="f_seq" />
</resultMap> </resultMap>
<sql id="selectTCountyLevelRegionVo"> <sql id="selectTCountyLevelRegionVo">
select f_id, f_city_id, f_county_code, f_name, f_is_major ,f_sql from t_county_level_region select f_id, f_city_id, f_county_code, f_name, f_is_major ,f_seq from t_county_level_region
</sql> </sql>
<select id="selectTCountyLevelRegionList" parameterType="TCountyLevelRegion" resultMap="TCountyLevelRegionResult"> <select id="selectTCountyLevelRegionList" parameterType="TCountyLevelRegion" resultMap="TCountyLevelRegionResult">
......
zh-baseversion-system/src/main/resources/mapper/system/TInsRecInforMapper.xml
View file @ 4d41d425
...@@ -23,23 +23,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -23,23 +23,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTInsRecInforVo"> <sql id="selectTInsRecInforVo">
select f_ins_rec_infor_id, f_check_code, f_check_task_code, f_region_code, f_object_type, f_object_code, f_check_user_id, f_check_man_name, f_check_man_phone, f_check_time, f_hazards_num, f_dosc_need_execute, f_annex, f_last_update_time, f_remark from t_ins_rec_infor SELECT
rec.f_ins_rec_infor_id,
rec.f_check_code,
rec.f_check_task_code,
rec.f_region_code,
rec.f_object_type,
rec.f_object_code,
rec.f_check_user_id,
rec.f_check_man_name,
rec.f_check_man_phone,
rec.f_check_time,
rec.f_hazards_num,
rec.f_dosc_need_execute,
rec.f_annex,
rec.f_last_update_time,
rec.f_remark,
task.f_name as taskName,
(select f_name from t_county_level_region where f_county_code = rec.f_region_code) AS countyName
FROM
t_ins_rec_infor rec
LEFT JOIN t_ins_task_infor task ON task.f_unique_code = rec.f_check_task_code
</sql> </sql>
<select id="selectTInsRecInforList" parameterType="TInsRecInfor" resultMap="TInsRecInforResult"> <select id="selectTInsRecInforList" parameterType="TInsRecInfor" resultMap="TInsRecInforResult">
<include refid="selectTInsRecInforVo"/> <include refid="selectTInsRecInforVo"/>
<where> <where>
<if test="fCheckCode != null and fCheckCode != ''"> and f_check_code = #{fCheckCode}</if> <if test="fCheckCode != null and fCheckCode != ''"> and rec.f_check_code = #{fCheckCode}</if>
<if test="fObjectType != null and fObjectType != ''"> and f_object_type = #{fObjectType}</if> <if test="fObjectType != null and fObjectType != ''"> and rec.f_object_type = #{fObjectType}</if>
<if test="fCheckManName != null and fCheckManName != ''"> and f_check_man_name like concat('%', #{fCheckManName}, '%')</if> <if test="fCheckManName != null and fCheckManName != ''"> and rec.f_check_man_name like concat('%', #{fCheckManName}, '%')</if>
<if test="fCheckManPhone != null and fCheckManPhone != ''"> and f_check_man_phone like concat('%', #{fCheckManPhone}, '%')</if> <if test="fCheckManPhone != null and fCheckManPhone != ''"> and rec.f_check_man_phone like concat('%', #{fCheckManPhone}, '%')</if>
</where> </where>
ORDER BY f_last_update_time DESC ORDER BY f_last_update_time DESC
</select> </select>
<select id="selectTInsRecInforById" parameterType="Long" resultMap="TInsRecInforResult"> <select id="selectTInsRecInforById" parameterType="Long" resultMap="TInsRecInforResult">
<include refid="selectTInsRecInforVo"/> <include refid="selectTInsRecInforVo"/>
where f_ins_rec_infor_id = #{fInsRecInforId} where rec.f_ins_rec_infor_id = #{fInsRecInforId}
</select> </select>
<insert id="insertTInsRecInfor" parameterType="TInsRecInfor" useGeneratedKeys="true" keyProperty="fInsRecInforId"> <insert id="insertTInsRecInfor" parameterType="TInsRecInfor" useGeneratedKeys="true" keyProperty="fInsRecInforId">
......
zh-baseversion-web/src/api/area/county.js
View file @ 4d41d425
...@@ -51,3 +51,11 @@ export function exportRegion(query) { ...@@ -51,3 +51,11 @@ export function exportRegion(query) {
params: query params: query
}) })
} }
//获取系统设置县
export function getDefaultCountyList() {
return request({
url: '/area/county/getDefaultCountyList',
method: 'get',
})
}
zh-baseversion-web/src/views/supervision/record/components/DetailInfo.vue
View file @ 4d41d425
<template> <template>
<el-dialog title="详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false"> <el-dialog title="详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
<el-form label-width="130px"> <!-- 检查记录详情 -->
<el-row class="el-row-table"> <InspectInfo v-if="detailOpen" :detailInfo="detailInfo"/>
<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.fCheckTaskCode">{{ detailInfo.fCheckTaskCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="县级行政区ID">
<span v-if="detailInfo.fRegionCode">{{ detailInfo.fRegionCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查对象分类">
<span v-if="detailInfo.fObjectType">{{ detailInfo.fObjectType }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="对象编码">
<span v-if="detailInfo.fObjectCode">{{ detailInfo.fObjectCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查人员id">
<span v-if="detailInfo.fCheckUserId">{{ detailInfo.fCheckUserId }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查人员姓名">
<span v-if="detailInfo.fCheckManName">{{ detailInfo.fCheckManName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<span v-if="detailInfo.fCheckManPhone">{{ detailInfo.fCheckManPhone }}</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.fHazardsNum">{{ detailInfo.fHazardsNum }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否需执法">
<span v-if="detailInfo.fDoscNeedExecute">{{ detailInfo.fDoscNeedExecute }}</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-col :span="12">
<el-form-item label="修改时间">
<span v-if="detailInfo.fLastUpdateTime">{{ detailInfo.fLastUpdateTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="检查单等照片">
<el-image
:src="detailInfo.fAnnex"
:preview-src-list="[detailInfo.fAnnex]"
v-if="detailInfo.fAnnex != '' && detailInfo.fAnnex != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog> </el-dialog>
...@@ -117,6 +10,7 @@ ...@@ -117,6 +10,7 @@
<script> <script>
import { getInfor } from "@/api/supervision/record"; import { getInfor } from "@/api/supervision/record";
import InspectInfo from "./InspectInfo";
export default { export default {
name: "detail-info", name: "detail-info",
data(){ data(){
...@@ -124,9 +18,12 @@ ...@@ -124,9 +18,12 @@
detailInfo: { detailInfo: {
fDeleteFlag: 0 fDeleteFlag: 0
}, },
detailOpen: false detailOpen: false,
} }
}, },
components:{
InspectInfo,
},
methods:{ methods:{
getDetailInfo(id){ getDetailInfo(id){
getInfor(id).then(res =>{ getInfor(id).then(res =>{
...@@ -135,7 +32,7 @@ ...@@ -135,7 +32,7 @@
this.detailOpen = true; this.detailOpen = true;
} }
}) })
} },
} }
} }
</script> </script>
......
zh-baseversion-web/src/views/supervision/record/components/InspectInfo.vue 0 → 100644
View file @ 4d41d425
<template>
<div>
<h3>检查记录详情</h3>
<el-form label-width="130px">
<el-row class="el-row-table">
<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.fCheckTaskCode">{{ detailInfo.fCheckTaskCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="县级行政区">
<span v-if="detailInfo.countyName">{{ detailInfo.countyName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查对象分类">
<span v-if="detailInfo.fObjectType">{{ detailInfo.fObjectType }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="对象编码">
<span v-if="detailInfo.fObjectCode">{{ detailInfo.fObjectCode }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查人员">
<span v-if="detailInfo.fCheckManName">{{ detailInfo.fCheckManName }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查人员联系电话">
<span v-if="detailInfo.fCheckManPhone">{{ detailInfo.fCheckManPhone }}</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.fHazardsNum">{{ detailInfo.fHazardsNum }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否需执法">
<span v-if="detailInfo.fDoscNeedExecute">{{ detailInfo.fDoscNeedExecute }}</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-col :span="12">
<el-form-item label="修改时间">
<span v-if="detailInfo.fLastUpdateTime">{{ detailInfo.fLastUpdateTime }}</span>
<span v-else>-</span>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="检查单等照片">
<el-image
:src="detailInfo.fAnnex"
:preview-src-list="[detailInfo.fAnnex]"
v-if="detailInfo.fAnnex != '' && detailInfo.fAnnex != null"
:z-index=5000
style="width: 200px;height: 200px;"
></el-image>
<span v-else>-</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</template>
<script>
export default {
name: "inspect-info",
props:{
detailInfo:{
type:Object
}
}
}
</script>
<style scoped>
</style>
zh-baseversion-web/src/views/supervision/record/components/TaskInfo.vue 0 → 100644
View file @ 4d41d425
<template>
<el-dialog title="任务详情" :visible.sync="detailOpen" width="1000px" append-to-body destroy-on-close :close-on-click-modal="false">
<!-- 任务详情 -->
<TaskInfo v-if="detailOpen" :detailInfo="taskInfo"/>
<!-- 检查范围 -->
<Scope v-if="detailOpen" :fHazardCheckTaskId="taskInfo.fInsTaskInforId"/>
<!-- 检查项 -->
<Inspect v-if="detailOpen" :fCheckTaskCode="taskInfo.fUniqueCode"/>
<!-- 调查项 -->
<Survey v-if="detailOpen" :fCheckTaskCode="taskInfo.fUniqueCode"/>
</el-dialog>
</template>
<script>
import { listInfor } from "@/api/supervision/task";
import TaskInfo from "../../task/components/TaskInfo";
import Scope from "../../task/components/Scope";
import Inspect from "../../task/components/Inspect";
import Survey from "../../task/components/Survey";
export default {
name: "task-info",
components:{
TaskInfo,
Scope,
Inspect,
Survey
},
data(){
return{
detailOpen: false,
taskInfo:{},
}
},
methods:{
getTaskInfo(fCheckTaskCode){
listInfor({fUniqueCode:fCheckTaskCode}).then(res =>{
if(res.code == 200 && res.rows){
this.taskInfo = res.rows[0];
this.detailOpen = true;
}
})
},
}
}
</script>
<style scoped>
</style>
zh-baseversion-web/src/views/supervision/record/index.vue
View file @ 4d41d425
...@@ -91,8 +91,20 @@ ...@@ -91,8 +91,20 @@
<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" />
<el-table-column label="任务编码" align="center" prop="fCheckTaskCode" /> <el-table-column label="任务编码" align="center" prop="fCheckTaskCode" />
<el-table-column label="县级行政区ID" align="center" prop="fRegionCode" /> <el-table-column label="任务名称" align="center" prop="taskName">
<el-table-column label="检查对象分类" align="center" prop="fObjectType" :formatter="fObjectTypeFormat" /> <template slot-scope="scope">
<span
@click="taskDetail(scope.row.fCheckTaskCode)"
v-if="scope.row.taskName"
style="color: blue; cursor: pointer;"
>
{{ scope.row.taskName }}
</span>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="县级行政区" align="center" prop="countyName" />
<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">
...@@ -156,23 +168,18 @@ ...@@ -156,23 +168,18 @@
<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="900px" 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-form-item label="检查记录编码" prop="fCheckCode">
<el-input v-model="form.fCheckCode" placeholder="请输入检查记录编码" />
</el-form-item>
</el-col>
-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务编码" prop="fCheckTaskCode"> <el-form-item label="任务编码" prop="fCheckTaskCode">
<el-select <el-select
v-model="form.fCheckTaskCode" v-model="form.fCheckTaskCode"
placeholder="请选择任务编码" placeholder="请选择任务编码"
style="width: 100%" style="width: 100%"
@change="taskChange"
> >
<el-option <el-option
v-for="task in taskData" v-for="task in taskData"
:key="task.fInsTaskInforId" :key="task.fInsTaskInforId"
:label="task.fUniqueCode" :label="task.fName + ' ' +task.fUniqueCode"
:value="task.fUniqueCode" :value="task.fUniqueCode"
/> />
</el-select> </el-select>
...@@ -180,8 +187,25 @@ ...@@ -180,8 +187,25 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="县级行政区ID" prop="fRegionCode"> <el-form-item label="任务名称">
<el-input v-model="form.fRegionCode" placeholder="请输入县级行政区ID" /> <el-input disabled v-model="taskName" placeholder="任务名称" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="县级行政区" prop="fRegionCode">
<el-select
v-model="form.fRegionCode"
placeholder="请选择县级行政区"
style="width: 100%"
>
<el-option
v-for="county in countyInfo"
:key="county.fId"
:label="county.fName.trim()"
:value="county.fCountyCode"
/>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -191,12 +215,13 @@ ...@@ -191,12 +215,13 @@
v-model="form.fObjectType" v-model="form.fObjectType"
placeholder="请选择检查对象分类" placeholder="请选择检查对象分类"
style="width: 100%" style="width: 100%"
@change="objectTypeChange"
> >
<el-option <el-option
v-for="dict in fObjectTypeOptions" v-for="dict in fObjectTypeOptions"
:key="dict.dictValue" :key="dict.dictValue"
:label="dict.dictLabel" :label="dict.dictLabel"
:value="dict.dictValue" :value="dict.dictLabel"
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -204,19 +229,25 @@ ...@@ -204,19 +229,25 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="对象编码" prop="fObjectCode"> <el-form-item label="对象编码" prop="fObjectCode">
<el-input v-model="form.fObjectCode" placeholder="请输入对象编码" /> <el-input disabled v-model="form.fObjectCode" placeholder="请输入对象编码" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检查人员id" prop="fCheckUserId">
<el-input v-model="form.fCheckUserId" placeholder="请输入检查人员id" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="检查人员姓名" prop="fCheckManName"> <el-form-item label="检查人员" prop="fCheckUserId">
<el-input v-model="form.fCheckManName" placeholder="请输入检查人员姓名" /> <el-select
v-model="form.fCheckUserId"
placeholder="请选择检查人员"
style="width: 100%"
@change="inspectorChange"
>
<el-option
v-for="inspect in inspector"
:key="inspect.userId"
:label="inspect.nickName"
:value="''+inspect.userId"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -284,6 +315,9 @@ ...@@ -284,6 +315,9 @@
<!-- 详情 --> <!-- 详情 -->
<DetailInfo ref="detail"/> <DetailInfo ref="detail"/>
<!-- 任务详情 -->
<TaskInfo ref="task"/>
</div> </div>
</template> </template>
...@@ -292,11 +326,15 @@ import { listInfor, getInfor, delInfor, addInfor, updateInfor, exportInfor, repo ...@@ -292,11 +326,15 @@ import { listInfor, getInfor, delInfor, addInfor, updateInfor, exportInfor, repo
import ImageUpload from '@/components/ImageUpload'; import ImageUpload from '@/components/ImageUpload';
import { taskList } from "@/api/supervision/task"; import { taskList } from "@/api/supervision/task";
import DetailInfo from "./components/DetailInfo"; import DetailInfo from "./components/DetailInfo";
import { getDefaultCountyList } from "@/api/area/county";
import { getInspectionUsers } from "@/api/system/user";
import TaskInfo from "./components/TaskInfo";
export default { export default {
name: "Infor", name: "Infor",
components: { components: {
ImageUpload, ImageUpload,
DetailInfo DetailInfo,
TaskInfo
}, },
data() { data() {
return { return {
...@@ -351,10 +389,7 @@ export default { ...@@ -351,10 +389,7 @@ export default {
{ required: true, message: "对象编码不能为空", trigger: "blur" } { required: true, message: "对象编码不能为空", trigger: "blur" }
], ],
fCheckUserId: [ fCheckUserId: [
{ required: true, message: "检查人员id不能为空", trigger: "blur" } { required: true, message: "请选择检查人员", trigger: "change" }
],
fCheckManName: [
{ required: true, message: "检查人员姓名不能为空", trigger: "blur" }
], ],
fCheckTime: [ fCheckTime: [
{ required: true, message: "检查时间不能为空", trigger: "blur" } { required: true, message: "检查时间不能为空", trigger: "blur" }
...@@ -362,6 +397,9 @@ export default { ...@@ -362,6 +397,9 @@ export default {
}, },
taskData: [], taskData: [],
fCheckCodes: [], fCheckCodes: [],
taskName: "",
countyInfo: [],
inspector: []
}; };
}, },
created() { created() {
...@@ -409,6 +447,7 @@ export default { ...@@ -409,6 +447,7 @@ export default {
fRemark: null fRemark: null
}; };
this.resetForm("form"); this.resetForm("form");
this.taskName = "";
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
...@@ -431,6 +470,8 @@ export default { ...@@ -431,6 +470,8 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.getTaskList(); this.getTaskList();
this.getCountyInfo();
this.getInspector();
this.open = true; this.open = true;
this.title = "添加检查记录"; this.title = "添加检查记录";
}, },
...@@ -441,6 +482,8 @@ export default { ...@@ -441,6 +482,8 @@ export default {
getInfor(fInsRecInforId).then(response => { getInfor(fInsRecInforId).then(response => {
this.form = response.data; this.form = response.data;
this.getTaskList(); this.getTaskList();
this.getCountyInfo();
this.getInspector();
this.open = true; this.open = true;
this.title = "修改检查记录"; this.title = "修改检查记录";
}); });
...@@ -521,6 +564,35 @@ export default { ...@@ -521,6 +564,35 @@ export default {
this.msgSuccess("上传成功"); this.msgSuccess("上传成功");
}).catch(() => {}); }).catch(() => {});
}, },
taskChange(val){
const selectTask = this.taskData.find(item => item.fUniqueCode == val);
this.taskName = selectTask.fName;
},
//获取县级
getCountyInfo(){
getDefaultCountyList().then(res =>{
if(res.code == 200 && res.data){
this.countyInfo = res.data;
}
})
},
objectTypeChange(val){
this.form.fObjectCode = this.fObjectTypeOptions.find(item => item.dictLabel == val).dictValue;
},
//获取检查人信息
getInspector(){
getInspectionUsers(-2,null).then(res =>{
if(res.code == 200 && res.data){
this.inspector = res.data;
}
})
},
inspectorChange(val){
this.form.fCheckManName = this.inspector.find(item => item.userId == val).nickName;
},
taskDetail(fCheckTaskCode){
this.$refs.task.getTaskInfo(fCheckTaskCode);
}
} }
}; };
</script> </script>
zh-baseversion-web/src/views/supervision/task/components/DetailInfo.vue
View file @ 4d41d425
<template> <template>
<el-dialog title="详情" :visible.sync="detailOpen" width="1200px" append-to-body destroy-on-close :close-on-click-modal="false"> <el-dialog title="详情" :visible.sync="detailOpen" width="1200px" append-to-body destroy-on-close :close-on-click-modal="false">
<!-- 任务详情 --> <!-- 任务详情 -->
<TaskInfo :detailInfo="detailInfo"/> <TaskInfo v-if="detailOpen" :detailInfo="detailInfo"/>
<!-- 检查范围 --> <!-- 检查范围 -->
<Scope v-if="detailOpen" :fHazardCheckTaskId="detailInfo.fInsTaskInforId"/> <Scope v-if="detailOpen" :fHazardCheckTaskId="detailInfo.fInsTaskInforId"/>
......
zh-baseversion-web/src/views/supervision/task/components/TaskInfo.vue
View file @ 4d41d425
...@@ -26,14 +26,14 @@ ...@@ -26,14 +26,14 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务类型"> <el-form-item label="任务类型">
<span v-if="detailInfo.fTaskType">{{ $parent.$parent.$parent.fTaskTypeFormat(detailInfo) }}</span> <span v-if="detailInfo.fTaskType">{{ fTaskTypeFormat(detailInfo) }}</span>
<span v-else>-</span> <span v-else>-</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否下发"> <el-form-item label="是否下发">
<span v-if="detailInfo.fDistributeFlag">{{ $parent.$parent.$parent.fDistributeFlagFormat(detailInfo) }}</span> <span v-if="detailInfo.fDistributeFlag">{{ fDistributeFlagFormat(detailInfo) }}</span>
<span v-else>-</span> <span v-else>-</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -62,14 +62,14 @@ ...@@ -62,14 +62,14 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="任务状态"> <el-form-item label="任务状态">
<span v-if="detailInfo.fStatus">{{ $parent.$parent.$parent.fStatusFormat(detailInfo) }}</span> <span v-if="detailInfo.fStatus">{{ fStatusFormat(detailInfo) }}</span>
<span v-else>-</span> <span v-else>-</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="删除标记"> <el-form-item label="删除标记">
<span v-if="detailInfo.fDeleteFlag.toString()">{{ $parent.$parent.$parent.fDeleteFlagFormat(detailInfo) }}</span> <span v-if="detailInfo.fDeleteFlag && detailInfo.fDeleteFlag.toString()">{{ fDeleteFlagFormat(detailInfo) }}</span>
<span v-else>-</span> <span v-else>-</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -121,6 +121,52 @@ ...@@ -121,6 +121,52 @@
detailInfo:{ detailInfo:{
type: Object type: Object
} }
},
data(){
return{
fTaskTypeOptions: [],
// 是否下发 0-不下发 1 - 下发字典
fDistributeFlagOptions: [],
// 任务状态，NEW-未开始，ING-进行中，DON-已完结，OVD-超期未完成字典
fStatusOptions: [],
// 删除标记，0-可用，1-已删除字典
fDeleteFlagOptions: [],
}
},
created(){
this.getTaskDict();
},
methods:{
getTaskDict(){
this.getDicts("t_supervision_task_type").then(response => {
this.fTaskTypeOptions = response.data;
});
this.getDicts("t_distribute_flag").then(response => {
this.fDistributeFlagOptions = response.data;
});
this.getDicts("t_supervision_task_status").then(response => {
this.fStatusOptions = response.data;
});
this.getDicts("t_delete_flag").then(response => {
this.fDeleteFlagOptions = response.data;
});
},
// 任务类型 0-专项 1-日常 2-第三方评估抽查 3-随机抽查字典翻译
fTaskTypeFormat(row, column) {
return this.selectDictLabel(this.fTaskTypeOptions, row.fTaskType);
},
// 是否下发 0-不下发 1 - 下发字典翻译
fDistributeFlagFormat(row, column) {
return this.selectDictLabel(this.fDistributeFlagOptions, row.fDistributeFlag);
},
// 任务状态，NEW-未开始，ING-进行中，DON-已完结，OVD-超期未完成字典翻译
fStatusFormat(row, column) {
return this.selectDictLabel(this.fStatusOptions, row.fStatus);
},
// 删除标记，0-可用，1-已删除字典翻译
fDeleteFlagFormat(row, column) {
return this.selectDictLabel(this.fDeleteFlagOptions, row.fDeleteFlag);
},
} }
} }
</script> </script>
......
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