Commit bfd55630 authored by 耿迪迪's avatar 耿迪迪

居民工商业安检人联想功能

parent 5e5958e5
...@@ -65,6 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -65,6 +65,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="userName != null and userName != ''"> <if test="userName != null and userName != ''">
AND u.user_name like concat('%', #{userName}, '%') AND u.user_name like concat('%', #{userName}, '%')
</if> </if>
<if test="nickName != null and nickName != ''">
AND u.nick_name like concat('%', #{nickName}, '%')
</if>
<if test="status != null and status != ''"> <if test="status != null and status != ''">
AND u.status = #{status} AND u.status = #{status}
</if> </if>
......
...@@ -108,13 +108,23 @@ ...@@ -108,13 +108,23 @@
</el-form-item> </el-form-item>
<el-form-item label="安检人" prop="nickName"> <el-form-item label="安检人" prop="nickName">
<el-input <!--<el-input
v-model="queryParams.nickName" v-model="queryParams.nickName"
placeholder="请输入安检人" placeholder="请输入安检人"
clearable clearable
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />-->
<el-autocomplete
class="inline-input"
v-model="queryParams.nickName"
:fetch-suggestions="queryInspectorSearch"
placeholder="请输入安检人"
:trigger-on-focus="false"
clearable
size="small"
@keyup.enter.native="handleQuery"
></el-autocomplete>
</el-form-item> </el-form-item>
<!--<el-form-item label="隐患情况" prop="status">--> <!--<el-form-item label="隐患情况" prop="status">-->
<!--<el-select v-model="queryParams.status" placeholder="请选择0未检测 1有隐患,2整改完成,3完结" clearable size="small">--> <!--<el-select v-model="queryParams.status" placeholder="请选择0未检测 1有隐患,2整改完成,3完结" clearable size="small">-->
...@@ -341,6 +351,7 @@ import imgB from "@/assets/ajImg/imgB.png"; ...@@ -341,6 +351,7 @@ import imgB from "@/assets/ajImg/imgB.png";
import imgC from "@/assets/ajImg/imgC.png"; import imgC from "@/assets/ajImg/imgC.png";
import { taskDetailInfo, taskInspectDetailInfo, taskInspectDangerDetailInfo } from "@/api/checktask/task"; import { taskDetailInfo, taskInspectDetailInfo, taskInspectDangerDetailInfo } from "@/api/checktask/task";
import ExportInspect from "./ExportInspect"; import ExportInspect from "./ExportInspect";
import { userInfoList } from "@/api/system/user";
export default { export default {
name: "cyInspect", name: "cyInspect",
components: { components: {
...@@ -658,7 +669,15 @@ export default { ...@@ -658,7 +669,15 @@ export default {
}, },
handleBatchInspectExport(){ handleBatchInspectExport(){
this.$refs.exportInspect.init(this.queryParams); this.$refs.exportInspect.init(this.queryParams);
},
queryInspectorSearch(queryString, cb){
userInfoList({nickName:queryString}).then(res =>{
if(res.code == 200 && res.data){
let result = res.data.map(item => ({value: item.nickName}));
cb(result);
} }
})
},
}, },
}; };
</script> </script>
......
...@@ -129,13 +129,24 @@ ...@@ -129,13 +129,24 @@
</el-form-item> </el-form-item>
<el-form-item label="安检人" prop="nickName"> <el-form-item label="安检人" prop="nickName">
<el-input <!--<el-input
v-model="queryParams.nickName" v-model="queryParams.nickName"
placeholder="请输入安检人" placeholder="请输入安检人"
clearable clearable
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />-->
<el-autocomplete
class="inline-input"
v-model="queryParams.nickName"
:fetch-suggestions="queryInspectorSearch"
placeholder="请输入安检人"
:trigger-on-focus="false"
clearable
size="small"
@keyup.enter.native="handleQuery"
></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item label="所属村庄" prop="village"> <el-form-item label="所属村庄" prop="village">
...@@ -358,6 +369,7 @@ import imgC from "@/assets/ajImg/imgC.png"; ...@@ -358,6 +369,7 @@ import imgC from "@/assets/ajImg/imgC.png";
import { taskDetailInfo, taskInspectDetailInfo, taskInspectDangerDetailInfo } from "@/api/checktask/task"; import { taskDetailInfo, taskInspectDetailInfo, taskInspectDangerDetailInfo } from "@/api/checktask/task";
import { communityList } from "@/api/baseinfo/community"; import { communityList } from "@/api/baseinfo/community";
import ExportInspect from "./ExportInspect"; import ExportInspect from "./ExportInspect";
import { userInfoList } from "@/api/system/user";
export default { export default {
name: "Inspect", name: "Inspect",
components: { components: {
...@@ -731,6 +743,14 @@ export default { ...@@ -731,6 +743,14 @@ export default {
this.queryParams.beginDate = val[0]; this.queryParams.beginDate = val[0];
this.queryParams.endDate = val[1]; this.queryParams.endDate = val[1];
}, },
queryInspectorSearch(queryString, cb){
userInfoList({nickName:queryString}).then(res =>{
if(res.code == 200 && res.data){
let result = res.data.map(item => ({value: item.nickName}));
cb(result);
}
})
},
}, },
}; };
</script> </script>
......
...@@ -106,13 +106,23 @@ ...@@ -106,13 +106,23 @@
</el-form-item> </el-form-item>
<el-form-item label="安检人" prop="inspector"> <el-form-item label="安检人" prop="inspector">
<el-input <!--<el-input
v-model="queryParams.inspector" v-model="queryParams.inspector"
placeholder="请输入安检人" placeholder="请输入安检人"
clearable clearable
size="small" size="small"
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />-->
<el-autocomplete
class="inline-input"
v-model="queryParams.inspector"
:fetch-suggestions="queryInspectorSearch"
placeholder="请输入安检人"
:trigger-on-focus="false"
clearable
size="small"
@keyup.enter.native="handleQuery"
></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -251,6 +261,7 @@ import imgB from "@/assets/ajImg/imgB.png"; ...@@ -251,6 +261,7 @@ import imgB from "@/assets/ajImg/imgB.png";
import imgC from "@/assets/ajImg/imgC.png"; import imgC from "@/assets/ajImg/imgC.png";
import { taskDetailInfo, taskInspectDetailInfo, taskInspectDangerDetailInfo } from "@/api/checktask/task"; import { taskDetailInfo, taskInspectDetailInfo, taskInspectDangerDetailInfo } from "@/api/checktask/task";
import ExportInspect from "../inspect/ExportInspect"; import ExportInspect from "../inspect/ExportInspect";
import { userInfoList } from "@/api/system/user";
export default { export default {
name: "industry-detail", name: "industry-detail",
components: { components: {
...@@ -404,7 +415,15 @@ export default { ...@@ -404,7 +415,15 @@ export default {
query.nickName = this.queryParams.inspector; query.nickName = this.queryParams.inspector;
query.companyName = this.queryParams.company; query.companyName = this.queryParams.company;
this.$refs.exportInspect.init(query); this.$refs.exportInspect.init(query);
},
queryInspectorSearch(queryString, cb){
userInfoList({nickName:queryString}).then(res =>{
if(res.code == 200 && res.data){
let result = res.data.map(item => ({value: item.nickName}));
cb(result);
} }
})
},
}, },
}; };
</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