Skip to content

R
rongtong-pc
Commit 90e55b35 authored by 陈晓晋's avatar 陈晓晋
Browse files
Options

Merge branch 'xjchen' into 'develop' 

修改项目到房间20230713

See merge request !1
parents 01f017d1 fe11e5ae
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 75 deletions
src/api/ledger/room.js
View file @ 90e55b35
...@@ -20,7 +20,7 @@ export function getRoom(id) { ...@@ -20,7 +20,7 @@ export function getRoom(id) {
// 新增基础数据-楼层 // 新增基础数据-楼层
export function addRoom(data) { export function addRoom(data) {
return request({ return request({
url: '/system/ledger/room', url: '/system/ledger/room/save',
method: 'post', method: 'post',
data: data data: data
}) })
......
src/views/ledger/building/index.vue
View file @ 90e55b35
<template> <template>
<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="项目id" prop="projectId"> <el-form-item label="项目名称" prop="projectName">
<el-input <el-input
v-model="queryParams.projectId" v-model="queryParams.projectName"
placeholder="请输入项目id" placeholder="请输入项目"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="组织机构id" prop="deptId"> <el-form-item label="组织机构" prop="deptName">
<el-input <el-input
v-model="queryParams.deptId" v-model="queryParams.deptName"
placeholder="请输入组织机构id" placeholder="请输入组织机构"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="楼层" prop="floor"> <el-form-item label="楼层数" prop="floor">
<el-input <el-input
v-model="queryParams.floor" v-model="queryParams.floor"
placeholder="请输入楼层" placeholder="请输入楼层"
...@@ -119,17 +119,21 @@ ...@@ -119,17 +119,21 @@
<el-table v-loading="loading" :data="buildingList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="buildingList" @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="${comment}" align="center" prop="id" /> <el-table-column label="序号" align="center" prop="id" />
<el-table-column label="项目id" align="center" prop="projectId" /> <el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="楼宇名称" align="center" prop="name" /> <el-table-column label="楼宇名称" align="center" prop="name" />
<el-table-column label="资产类型" align="center" prop="type" /> <el-table-column label="资产类型" align="center" prop="type" />
<el-table-column label="组织机构id" align="center" prop="deptId" /> <el-table-column label="组织机构" align="center" prop="deptName" />
<el-table-column label="楼层" align="center" prop="floor" /> <el-table-column label="楼层数(层)" align="center" prop="floor" />
<el-table-column label="用途" align="center" prop="use" /> <el-table-column label="用途" align="center" prop="useto" />
<el-table-column label="所在城市" align="center" prop="city" /> <el-table-column label="所在城市" align="center" prop="city" />
<el-table-column label="资产面积" align="center" prop="area" /> <el-table-column label="资产面积(㎡)" align="center" prop="area" />
<el-table-column label="详细地址" align="center" prop="address" /> <el-table-column label="详细地址" align="center" prop="address" />
<el-table-column label="状态" align="center" prop="status" /> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -149,7 +153,7 @@ ...@@ -149,7 +153,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -159,22 +163,22 @@ ...@@ -159,22 +163,22 @@
/> />
<!-- 添加或修改基础数据-楼宇对话框 --> <!-- 添加或修改基础数据-楼宇对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-form-item label="项目id" prop="projectId"> <el-form-item label="项目名称" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目id" /> <el-input v-model="form.projectId" 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="请输入楼宇名称" />
</el-form-item> </el-form-item>
<el-form-item label="组织机构id" prop="deptId"> <el-form-item label="组织机构名称" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入组织机构id" /> <el-input v-model="form.deptId" placeholder="请输入组织机构名称" />
</el-form-item> </el-form-item>
<el-form-item label="楼层" prop="floor"> <el-form-item label="楼层数(层)" prop="floor">
<el-input v-model="form.floor" placeholder="请输入楼层" /> <el-input v-model="form.floor" placeholder="请输入楼层" />
</el-form-item> </el-form-item>
<el-form-item label="用途" prop="use"> <el-form-item label="用途" prop="use">
<el-input v-model="form.use" placeholder="请输入用途" /> <el-input v-model="form.useto" placeholder="请输入用途" />
</el-form-item> </el-form-item>
<el-form-item label="所在城市" prop="city"> <el-form-item label="所在城市" prop="city">
<el-input v-model="form.city" placeholder="请输入所在城市" /> <el-input v-model="form.city" placeholder="请输入所在城市" />
...@@ -185,9 +189,17 @@ ...@@ -185,9 +189,17 @@
<el-form-item label="详细地址" prop="address"> <el-form-item label="详细地址" prop="address">
<el-input v-model="form.address" placeholder="请输入详细地址" /> <el-input v-model="form.address" placeholder="请输入详细地址" />
</el-form-item> </el-form-item>
<el-form-item label="删除标志" prop="delFlag"> <el-form-item label="状态" prop="status">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" /> <el-select v-model="form.status" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</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>
...@@ -202,6 +214,7 @@ import { listBuilding, getBuilding, delBuilding, addBuilding, updateBuilding } f ...@@ -202,6 +214,7 @@ import { listBuilding, getBuilding, delBuilding, addBuilding, updateBuilding } f
export default { export default {
name: "Building", name: "Building",
dicts: ['sys_normal_disable', 'data_source'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
......
src/views/ledger/floor/index.vue
View file @ 90e55b35
<template> <template>
<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="楼宇id" prop="buildingId"> <el-form-item label="楼宇名称" prop="buildingName">
<el-input <el-input
v-model="queryParams.buildingId" v-model="queryParams.buildingId"
placeholder="请输入楼宇id" placeholder="请输入楼宇名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -79,12 +79,16 @@ ...@@ -79,12 +79,16 @@
<el-table v-loading="loading" :data="floorList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="floorList" @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="${comment}" align="center" prop="id" /> <el-table-column label="序号" align="center" prop="id" />
<el-table-column label="楼宇id" align="center" prop="buildingId" /> <el-table-column label="楼宇名称" align="center" prop="buildingName" />
<el-table-column label="楼层名称" align="center" prop="name" /> <el-table-column label="楼层名称" align="center" prop="name" />
<el-table-column label="楼层属性" align="center" prop="type" /> <el-table-column label="楼层属性" align="center" prop="type" />
<el-table-column label="房间数量" align="center" prop="roomNumber" /> <el-table-column label="房间数量(间)" align="center" prop="roomNumber" />
<el-table-column label="状态" align="center" prop="status" /> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -104,7 +108,7 @@ ...@@ -104,7 +108,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -116,8 +120,8 @@ ...@@ -116,8 +120,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="楼宇id" prop="buildingId"> <el-form-item label="楼宇名称" prop="buildingName">
<el-input v-model="form.buildingId" placeholder="请输入楼宇id" /> <el-input v-model="form.buildingId" 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="请输入楼层名称" />
...@@ -125,9 +129,17 @@ ...@@ -125,9 +129,17 @@
<el-form-item label="房间数量" prop="roomNumber"> <el-form-item label="房间数量" prop="roomNumber">
<el-input v-model="form.roomNumber" placeholder="请输入房间数量" /> <el-input v-model="form.roomNumber" placeholder="请输入房间数量" />
</el-form-item> </el-form-item>
<el-form-item label="删除标志" prop="delFlag"> <el-form-item label="状态" prop="status">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" /> <el-select v-model="form.status" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</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>
...@@ -142,6 +154,7 @@ import { listFloor, getFloor, delFloor, addFloor, updateFloor } from "@/api/ledg ...@@ -142,6 +154,7 @@ import { listFloor, getFloor, delFloor, addFloor, updateFloor } from "@/api/ledg
export default { export default {
name: "Floor", name: "Floor",
dicts: ['sys_normal_disable', 'data_source'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
......
src/views/ledger/project/index.vue
View file @ 90e55b35
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="组织机构id" prop="deptId"> <el-form-item label="组织机构" prop="deptId">
<el-input <el-input
v-model="queryParams.deptId" v-model="queryParams.deptId"
placeholder="请输入组织机构id" placeholder="请输入组织机构"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -33,13 +33,25 @@ ...@@ -33,13 +33,25 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="0-关联 1-自建" prop="source"> <el-form-item label="关联/自建" prop="source">
<el-input <el-select v-model="queryParams.source" placeholder="请选择关联/自建" clearable>
v-model="queryParams.source" <el-option
placeholder="请输入0-关联 1-自建" v-for="dict in dict.type.data_source"
clearable :key="dict.value"
@keyup.enter.native="handleQuery" :label="dict.label"
/> :value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
...@@ -55,7 +67,7 @@ ...@@ -55,7 +67,7 @@
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:project:add']" v-hasPermi="['ledger/project:project:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -66,7 +78,7 @@ ...@@ -66,7 +78,7 @@
size="mini" size="mini"
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:project:edit']" v-hasPermi="['ledger/project:project:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -77,7 +89,7 @@ ...@@ -77,7 +89,7 @@
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:project:remove']" v-hasPermi="['ledger/project:project:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
...@@ -87,7 +99,7 @@ ...@@ -87,7 +99,7 @@
icon="el-icon-download" icon="el-icon-download"
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:project:export']" v-hasPermi="['ledger/project:project:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
...@@ -95,14 +107,22 @@ ...@@ -95,14 +107,22 @@
<el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="projectList" @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="${comment}" align="center" prop="id" /> <el-table-column label="序号" align="center" prop="id" />
<el-table-column label="项目名称" align="center" prop="name" /> <el-table-column label="项目名称" align="center" prop="name" />
<el-table-column label="项目类型" align="center" prop="type" /> <el-table-column label="项目类型" align="center" prop="type" />
<el-table-column label="组织机构id" align="center" prop="deptId" /> <el-table-column label="组织机构" align="center" prop="deptName" />
<el-table-column label="所在城市" align="center" prop="city" /> <el-table-column label="所在城市" align="center" prop="city" />
<el-table-column label="详细地址" align="center" prop="address" /> <el-table-column label="详细地址" align="center" prop="address" />
<el-table-column label="0-关联 1-自建" align="center" prop="source" /> <el-table-column label="关联/自建" align="center" prop="source">
<el-table-column label="状态" align="center" prop="status" /> <template slot-scope="scope">
<dict-tag :options="dict.type.data_source" :value="scope.row.source"/>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -110,19 +130,19 @@ ...@@ -110,19 +130,19 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:project:edit']" v-hasPermi="['ledger/project:project:edit']"
>修改</el-button> >修改</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-delete" icon="el-icon-delete"
@click="handleDelete(scope.row)" @click="handleDelete(scope.row)"
v-hasPermi="['system:project:remove']" v-hasPermi="['ledger/project:project:remove']"
>删除</el-button> >删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -137,8 +157,8 @@ ...@@ -137,8 +157,8 @@
<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="请输入项目名称" />
</el-form-item> </el-form-item>
<el-form-item label="组织机构id" prop="deptId"> <el-form-item label="归属部门" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入组织机构id" /> <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
</el-form-item> </el-form-item>
<el-form-item label="所在城市" prop="city"> <el-form-item label="所在城市" prop="city">
<el-input v-model="form.city" placeholder="请输入所在城市" /> <el-input v-model="form.city" placeholder="请输入所在城市" />
...@@ -146,12 +166,27 @@ ...@@ -146,12 +166,27 @@
<el-form-item label="详细地址" prop="address"> <el-form-item label="详细地址" prop="address">
<el-input v-model="form.address" placeholder="请输入详细地址" /> <el-input v-model="form.address" placeholder="请输入详细地址" />
</el-form-item> </el-form-item>
<el-form-item label="0-关联 1-自建" prop="source"> <el-form-item label="关联/自建" prop="source">
<el-input v-model="form.source" placeholder="请输入0-关联 1-自建" /> <el-select v-model="form.source" placeholder="请选择关联/自建">
<el-option
v-for="dict in dict.type.data_source"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="删除标志" prop="delFlag"> <el-form-item label="状态" prop="status">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" /> <el-select v-model="form.status" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</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>
...@@ -162,10 +197,15 @@ ...@@ -162,10 +197,15 @@
</template> </template>
<script> <script>
import { listProject, getProject, delProject, addProject, updateProject } from "@/api/ledger/project"; import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { listProject, getProject, delProject, addProject, updateProject } from "@/api/ledger/project/";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default { export default {
name: "Project", name: "Project",
dicts: ['sys_normal_disable', 'data_source'],
components: { Treeselect },
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -182,6 +222,8 @@ export default { ...@@ -182,6 +222,8 @@ export default {
total: 0, total: 0,
// 基础数据-项目表格数据 // 基础数据-项目表格数据
projectList: [], projectList: [],
// 部门树选项
deptOptions: undefined,
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
...@@ -205,8 +247,15 @@ export default { ...@@ -205,8 +247,15 @@ export default {
} }
}; };
}, },
watch: {
// 根据名称筛选部门树
deptName(val) {
this.$refs.tree.filter(val);
}
},
created() { created() {
this.getList(); this.getList();
this.getDeptTree();
}, },
methods: { methods: {
/** 查询基础数据-项目列表 */ /** 查询基础数据-项目列表 */
...@@ -218,6 +267,22 @@ export default { ...@@ -218,6 +267,22 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
/** 查询部门下拉树结构 */
getDeptTree() {
deptTreeSelect().then(response => {
this.deptOptions = response.data;
});
},
// 筛选节点
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
},
// 节点单击事件
handleNodeClick(data) {
this.queryParams.deptId = data.id;
this.handleQuery();
},
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false;
...@@ -306,7 +371,7 @@ export default { ...@@ -306,7 +371,7 @@ export default {
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
this.download('system/project/export', { this.download('ledger/project/project/export', {
...this.queryParams ...this.queryParams
}, `project_${new Date().getTime()}.xlsx`) }, `project_${new Date().getTime()}.xlsx`)
} }
......
src/views/ledger/room/index.vue
View file @ 90e55b35
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<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="楼层id" prop="floorId"> <el-form-item label="楼层id" prop="floorId">
<el-input <el-input
v-model="queryParams.floorId" v-model="queryParams.floorName"
placeholder="请输入楼层id" placeholder="请输入楼层"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -87,12 +87,16 @@ ...@@ -87,12 +87,16 @@
<el-table v-loading="loading" :data="roomList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="roomList" @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="${comment}" align="center" prop="id" /> <el-table-column label="序号" align="center" prop="id" />
<el-table-column label="楼层id" align="center" prop="floorId" /> <el-table-column label="楼层" align="center" prop="floorName" />
<el-table-column label="房间名称" align="center" prop="name" /> <el-table-column label="房间名称" align="center" prop="name" />
<el-table-column label="房间编号" align="center" prop="number" /> <el-table-column label="房间编号" align="center" prop="number" />
<el-table-column label="房间面积" align="center" prop="area" /> <el-table-column label="房间面积" align="center" prop="area" />
<el-table-column label="状态" align="center" prop="status" /> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
...@@ -112,7 +116,7 @@ ...@@ -112,7 +116,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
...@@ -124,8 +128,8 @@ ...@@ -124,8 +128,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="楼层id" prop="floorId"> <el-form-item label="楼层" prop="floorId">
<el-input v-model="form.floorId" placeholder="请输入楼层id" /> <el-input v-model="form.floorId" 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="请输入房间名称" />
...@@ -136,8 +140,15 @@ ...@@ -136,8 +140,15 @@
<el-form-item label="房间面积" prop="area"> <el-form-item label="房间面积" prop="area">
<el-input v-model="form.area" placeholder="请输入房间面积" /> <el-input v-model="form.area" placeholder="请输入房间面积" />
</el-form-item> </el-form-item>
<el-form-item label="删除标志" prop="delFlag"> <el-form-item label="状态" prop="status">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" /> <el-select v-model="form.status" placeholder="请选择状态">
<el-option
v-for="dict in dict.type.sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
...@@ -151,8 +162,10 @@ ...@@ -151,8 +162,10 @@
<script> <script>
import { listRoom, getRoom, delRoom, addRoom, updateRoom } from "@/api/ledger/room"; import { listRoom, getRoom, delRoom, addRoom, updateRoom } from "@/api/ledger/room";
export default { export default {
name: "Room", name: "Room",
dicts: ['sys_normal_disable', 'data_source'],
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