Commit 5751fc68 authored by kaitly205422@163.com's avatar kaitly205422@163.com

修复业态不能多选与传参问题

parent 45287186
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="项目业态" prop="business"> <el-form-item label="项目业态" prop="business">
<el-select v-model="queryParams.business" placeholder="请选择项目业态" clearable multiple> <el-select v-model="businessArr" placeholder="请选择项目业态" clearable multiple>
<el-option v-for="dict in dict.type.risk_project_business" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.risk_project_business" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
...@@ -237,6 +237,7 @@ export default { ...@@ -237,6 +237,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
powerOpen: false, powerOpen: false,
businessArr: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -302,6 +303,9 @@ export default { ...@@ -302,6 +303,9 @@ export default {
/** 查询基础数据-项目列表 */ /** 查询基础数据-项目列表 */
getList() { getList() {
this.loading = true; this.loading = true;
if (this.businessArr) {
this.queryParams.business = this.businessArr.join(',');
}
listProject(this.queryParams).then((response) => { listProject(this.queryParams).then((response) => {
this.projectList = response.rows; this.projectList = response.rows;
this.total = response.total; this.total = response.total;
......
...@@ -11,8 +11,11 @@ ...@@ -11,8 +11,11 @@
<el-input v-model="queryParams.city" placeholder="请输入所属城市" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.city" placeholder="请输入所属城市" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="项目业态" prop="businessFormat"> <el-form-item label="项目业态" prop="businessFormat">
<el-input v-model="queryParams.businessFormat" placeholder="请输入项目业态" clearable <!-- <el-input v-model="businessArr" placeholder="请输入项目业态" clearable @keyup.enter.native="handleQuery" /> -->
@keyup.enter.native="handleQuery" /> <el-select v-model="businessArr" placeholder="请选择项目业态" clearable multiple>
<el-option v-for="dict in dict.type.risk_project_business" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="固有风险危险源名称" prop="inherentName"> <el-form-item label="固有风险危险源名称" prop="inherentName">
<el-input v-model="queryParams.inherentName" placeholder="请输入固有风险危险源名称" clearable <el-input v-model="queryParams.inherentName" placeholder="请输入固有风险危险源名称" clearable
...@@ -177,7 +180,7 @@ import { inherentListList } from "@/api/risk/existing"; ...@@ -177,7 +180,7 @@ import { inherentListList } from "@/api/risk/existing";
export default { export default {
name: "inherent", name: "inherent",
dicts: ["risk_plan_level"], dicts: ["risk_plan_level", "risk_project_business"],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -198,6 +201,7 @@ export default { ...@@ -198,6 +201,7 @@ export default {
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
businessArr: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -224,6 +228,9 @@ export default { ...@@ -224,6 +228,9 @@ export default {
/** 查询固有风险清单库列表 */ /** 查询固有风险清单库列表 */
getList() { getList() {
this.loading = true; this.loading = true;
if (this.businessArr) {
this.queryParams.businessFormat = this.businessArr.join(',');
}
inherentListList(this.queryParams).then((response) => { inherentListList(this.queryParams).then((response) => {
this.inherentList = response.rows; this.inherentList = response.rows;
this.total = response.total; this.total = response.total;
......
...@@ -11,8 +11,7 @@ ...@@ -11,8 +11,7 @@
<el-input v-model="queryParams.city" placeholder="请输入所属城市" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.city" placeholder="请输入所属城市" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="项目业态" prop="businessFormat"> <el-form-item label="项目业态" prop="businessFormat">
<el-input v-model="queryParams.businessFormat" placeholder="请输入项目业态" clearable <el-input v-model="businessArr" placeholder="请输入项目业态" clearable @keyup.enter.native="handleQuery" />
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="固有风险危险源名称" prop="inherentName"> <el-form-item label="固有风险危险源名称" prop="inherentName">
<el-input v-model="queryParams.inherentName" placeholder="请输入固有风险危险源名称" clearable <el-input v-model="queryParams.inherentName" placeholder="请输入固有风险危险源名称" clearable
...@@ -39,7 +38,8 @@ ...@@ -39,7 +38,8 @@
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="可能导致的事故后果" prop="listType"> <el-form-item label="可能导致的事故后果" prop="listType">
<el-input v-model="queryParams.listType" placeholder="请输入可能导致的事故后果" clearable @keyup.enter.native="handleQuery" /> <el-input v-model="queryParams.listType" placeholder="请输入可能导致的事故后果" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
...@@ -128,7 +128,7 @@ export default { ...@@ -128,7 +128,7 @@ export default {
}; };
}, },
created() { created() {
this.queryParams.projectId=this.$route.params.projectId; this.queryParams.projectId = this.$route.params.projectId;
this.getList(); this.getList();
this.getExitList() this.getExitList()
}, },
...@@ -144,6 +144,9 @@ export default { ...@@ -144,6 +144,9 @@ export default {
/** 查询固有风险清单库列表 */ /** 查询固有风险清单库列表 */
getList() { getList() {
this.inherent.loading = true; this.inherent.loading = true;
if (this.businessArr) {
this.queryParams.businessFormat = this.businessArr.join(',');
}
inherentListList({ ...this.queryParams, ...this.existing.data.page }).then((response) => { inherentListList({ ...this.queryParams, ...this.existing.data.page }).then((response) => {
// this.inherentList = response.rows; // this.inherentList = response.rows;
// this.total = response.total; // this.total = response.total;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="项目业态" prop="business"> <el-form-item label="项目业态" prop="business">
<el-select v-model="queryParams.business" placeholder="请选择项目业态" clearable> <el-select v-model="businessArr" placeholder="请选择项目业态" multiple clearable>
<el-option v-for="dict in dict.type.risk_project_business" :key="dict.value" :label="dict.label" <el-option v-for="dict in dict.type.risk_project_business" :key="dict.value" :label="dict.label"
:value="dict.value" /> :value="dict.value" />
</el-select> </el-select>
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="projectList">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center"> <el-table-column label="序号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -111,6 +111,7 @@ export default { ...@@ -111,6 +111,7 @@ export default {
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
powerOpen: false, powerOpen: false,
businessArr: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
...@@ -139,6 +140,7 @@ export default { ...@@ -139,6 +140,7 @@ export default {
userPost: null, userPost: null,
postList: [], postList: [],
userInfoData: {}, userInfoData: {},
}; };
}, },
watch: { watch: {
...@@ -154,6 +156,9 @@ export default { ...@@ -154,6 +156,9 @@ export default {
/** 查询基础数据-项目列表 */ /** 查询基础数据-项目列表 */
getList() { getList() {
this.loading = true; this.loading = true;
if (this.businessArr) {
this.queryParams.business = this.businessArr.join(',');
}
listProject(this.queryParams).then((response) => { listProject(this.queryParams).then((response) => {
this.projectList = response.rows; this.projectList = response.rows;
this.total = response.total; this.total = response.total;
......
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