Commit fd7cb029 authored by kaitly205422@163.com's avatar kaitly205422@163.com

项目/楼宇添加详情

parent 5751fc68
...@@ -126,6 +126,10 @@ export const constantRoutes = [ ...@@ -126,6 +126,10 @@ export const constantRoutes = [
}, },
], ],
}, },
/* 基本信息管理 */
{ {
path: "/login", path: "/login",
component: () => import("@/views/login"), component: () => import("@/views/login"),
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="项目名称" prop="projectName"> <el-form-item label="项目名称" prop="projectName">
<el-input v-model="queryParams.projectName" placeholder="请输入项目" clearable @keyup.enter.native="handleQuery" /> <el-input :disabled="Boolean(isFilterId)" v-model="queryParams.projectName" placeholder="请输入项目" clearable
@keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="楼宇名称" prop="name"> <el-form-item label="楼宇名称" prop="name">
...@@ -58,7 +59,12 @@ ...@@ -58,7 +59,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="项目名称" align="center" prop="projectName" /> <el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="楼宇名称" align="center" prop="name" /> <el-table-column label="楼宇名称" align="center" prop="name">
<template slot-scope="scope">
<router-link class="link-type" :to="{ name: 'FloorFilter', query: { id: scope.row.id } }">{{ scope.row.name
}}</router-link>
</template>
</el-table-column>
<el-table-column label="资产类型" align="center" prop="type" /> <el-table-column label="资产类型" align="center" prop="type" />
<el-table-column label="所属区域" align="center" prop="deptName" /> <el-table-column label="所属区域" align="center" prop="deptName" />
<el-table-column label="楼层数(层)" align="center" prop="floor" /> <el-table-column label="楼层数(层)" align="center" prop="floor" />
...@@ -88,8 +94,8 @@ ...@@ -88,8 +94,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="项目名称" prop="projectId"> <el-form-item label="项目名称" prop="projectId">
<!-- <el-input v-model="form.projectId" placeholder="请输入项目名称" /> --> <!-- <el-input v-model="form.projectId" placeholder="请输入项目名称" /> -->
<el-select v-model="form.projectName" filterable remote reserve-keyword placeholder="搜索选择项目" <el-select :disabled="Boolean(isFilterId)" v-model="form.projectName" filterable remote reserve-keyword
:remote-method="remoteMethod" @change="changeProject" :loading="loading"> placeholder="搜索选择项目" :remote-method="remoteMethod" @change="changeProject" :loading="loading">
<el-option v-for="item in projectOptions" :key="item.id" :label="item.name" :value="item.name"> <el-option v-for="item in projectOptions" :key="item.id" :label="item.name" :value="item.name">
</el-option> </el-option>
</el-select> </el-select>
...@@ -139,6 +145,9 @@ import { ...@@ -139,6 +145,9 @@ import {
addBuilding, addBuilding,
updateBuilding, updateBuilding,
} from "@/api/ledger/building"; } from "@/api/ledger/building";
import {
getProject,
} from "@/api/ledger/project";
import { getProjectList as projectList } from '@/api/risk/plan'; import { getProjectList as projectList } from '@/api/risk/plan';
import { deptTreeSelect } from "@/api/system/user"; import { deptTreeSelect } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
...@@ -149,6 +158,11 @@ export default { ...@@ -149,6 +158,11 @@ export default {
components: { components: {
Treeselect, Treeselect,
}, },
computed: {
isFilterId() {
return this.$route.name === 'BuildingFilter' ? this.$route.query.id : null;
}
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -194,11 +208,24 @@ export default { ...@@ -194,11 +208,24 @@ export default {
projectOptions: [] projectOptions: []
}; };
}, },
created() { mounted() {
this.getList(); console.log(this.isFilterId);
this.getDeptTree(); if (this.isFilterId) {
this.getProjectDetail().then((response) => {
this.queryParams.projectName = response.data.name;
this.queryParams.projectId = response.data.id;
this.getList();
this.getDeptTree();
});
} else {
this.getList();
this.getDeptTree();
}
}, },
methods: { methods: {
getProjectDetail() {
return getProject(this.isFilterId)
},
changeProject(e) { changeProject(e) {
const projectInfo = this.projectOptions.find(x => x.name == e); const projectInfo = this.projectOptions.find(x => x.name == e);
this.form.projectId = projectInfo.id; this.form.projectId = projectInfo.id;
...@@ -272,6 +299,8 @@ export default { ...@@ -272,6 +299,8 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.form.projectName = this.queryParams.projectName;
this.form.projectId = this.queryParams.projectId;
this.title = "添加基础数据-楼宇"; this.title = "添加基础数据-楼宇";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="楼宇名称" prop="buildingName"> <el-form-item label="楼宇名称" prop="buildingName">
<el-input v-model="queryParams.buildingName" placeholder="请输入楼宇名称" clearable <el-input :disabled="Boolean(isFilterId)" v-model="queryParams.buildingName" placeholder="请输入楼宇名称" clearable
@keyup.enter.native="handleQuery" /> @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="楼层名称" prop="name"> <el-form-item label="楼层名称" prop="name">
...@@ -74,7 +74,8 @@ ...@@ -74,7 +74,8 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="楼宇名称" prop="buildingName"> <el-form-item label="楼宇名称" prop="buildingName">
<el-input :readonly="form.buildingId" v-model="form.buildingName" placeholder="请输入楼宇名称" /> <el-input :disabled="Boolean(isFilterId)" :readonly="form.buildingId" v-model="form.buildingName"
placeholder="请输入楼宇名称" />
</el-form-item> </el-form-item>
<el-form-item label="楼层名称" prop="name"> <el-form-item label="楼层名称" prop="name">
<el-input v-model="form.name" placeholder="请输入楼层名称" /> <el-input v-model="form.name" placeholder="请输入楼层名称" />
...@@ -109,10 +110,17 @@ import { ...@@ -109,10 +110,17 @@ import {
addFloor, addFloor,
updateFloor, updateFloor,
} from "@/api/ledger/floor"; } from "@/api/ledger/floor";
import {
getBuilding,
} from "@/api/ledger/building";
export default { export default {
name: "Floor", name: "Floor",
dicts: ["sys_normal_disable", "data_source"], dicts: ["sys_normal_disable", "data_source"],
computed: {
isFilterId() {
return this.$route.name === 'FloorFilter' ? this.$route.query.id : null;
}
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -149,10 +157,22 @@ export default { ...@@ -149,10 +157,22 @@ export default {
rules: {}, rules: {},
}; };
}, },
created() { mounted() {
this.getList(); if (this.isFilterId) {
this.getBuildingDetail().then((response) => {
this.queryParams.buildingId = response.data.id;
this.queryParams.buildingName = response.data.name;
this.getList();
});
} else {
this.getList();
}
}, },
methods: { methods: {
getBuildingDetail() {
return getBuilding(this.isFilterId)
},
handleManage({ id, buildingId }) { handleManage({ id, buildingId }) {
this.$router.push({ this.$router.push({
name: "drawCanvas", name: "drawCanvas",
...@@ -213,6 +233,8 @@ export default { ...@@ -213,6 +233,8 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.form.buildingId = this.queryParams.buildingId;
this.form.buildingName = this.queryParams.buildingName;
this.title = "添加基础数据-楼层"; this.title = "添加基础数据-楼层";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
......
...@@ -71,7 +71,12 @@ ...@@ -71,7 +71,12 @@
<span>{{ scope.$index + 1 }}</span> <span>{{ scope.$index + 1 }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="项目名称" align="center" prop="name" /> <el-table-column label="项目名称" align="center" prop="name">
<template slot-scope="scope">
<router-link class="link-type" :to="{ name: 'BuildingFilter', query: { id: scope.row.id } }">{{ scope.row.name
}}</router-link>
</template>
</el-table-column>
<el-table-column label="项目类型" align="center" prop="type" /> <el-table-column label="项目类型" align="center" prop="type" />
<el-table-column label="项目业态" align="center" prop="business" /> <el-table-column label="项目业态" align="center" prop="business" />
<el-table-column label="所属区域" align="center" prop="deptName" /> <el-table-column label="所属区域" align="center" prop="deptName" />
......
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