|
|
@@ -1,10 +1,15 @@
|
|
|
<template>
|
|
|
<div class="app-container">
|
|
|
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
|
|
|
+ <el-form
|
|
|
+ :model="queryParams"
|
|
|
+ ref="queryForm"
|
|
|
+ :inline="true"
|
|
|
+ v-show="showSearch"
|
|
|
+ label-width="68px"
|
|
|
+ >
|
|
|
<el-form-item label="坐落号" prop="number">
|
|
|
<el-input
|
|
|
v-model="queryParams.number"
|
|
|
-
|
|
|
clearable
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
@@ -13,7 +18,6 @@
|
|
|
<el-form-item label="分栋号" prop="number1">
|
|
|
<el-input
|
|
|
v-model="queryParams.number1"
|
|
|
-
|
|
|
clearable
|
|
|
size="small"
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
@@ -101,8 +105,16 @@
|
|
|
/>
|
|
|
</el-form-item> -->
|
|
|
<el-form-item>
|
|
|
- <el-button type="primary" icon="el-icon-search" size="btr" @click="handleQuery">搜索</el-button>
|
|
|
- <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ icon="el-icon-search"
|
|
|
+ size="btn"
|
|
|
+ @click="handleQuery"
|
|
|
+ >搜索</el-button
|
|
|
+ >
|
|
|
+ <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
|
|
|
+ >重置</el-button
|
|
|
+ >
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
|
|
|
@@ -115,9 +127,10 @@
|
|
|
size="mini"
|
|
|
@click="handleAdd"
|
|
|
v-hasPermi="['barracksManagement:flat:add']"
|
|
|
- >新增</el-button>
|
|
|
+ >新增</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
- <el-col :span="1.5">
|
|
|
+ <el-col :span="1.5">
|
|
|
<el-button
|
|
|
type="success"
|
|
|
plain
|
|
|
@@ -126,7 +139,8 @@
|
|
|
:disabled="single"
|
|
|
@click="handleUpdate"
|
|
|
v-hasPermi="['barracksManagement:flat:edit']"
|
|
|
- >修改</el-button>
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<el-col :span="1.5">
|
|
|
<el-button
|
|
|
@@ -137,7 +151,8 @@
|
|
|
:disabled="multiple"
|
|
|
@click="handleDelete"
|
|
|
v-hasPermi="['barracksManagement:flat:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</el-col>
|
|
|
<!--
|
|
|
<el-col :span="1.5">
|
|
|
@@ -151,12 +166,19 @@
|
|
|
v-hasPermi="['barracksManagement:flat:export']"
|
|
|
>导出</el-button>
|
|
|
</el-col> -->
|
|
|
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
+ <!-- <right-toolbar
|
|
|
+ :showSearch.sync="showSearch"
|
|
|
+ @queryTable="getList"
|
|
|
+ ></right-toolbar> -->
|
|
|
</el-row>
|
|
|
|
|
|
- <el-table v-loading="loading" :data="flatList" @selection-change="handleSelectionChange">
|
|
|
+ <el-table
|
|
|
+ v-loading="loading"
|
|
|
+ :data="flatList"
|
|
|
+ @selection-change="handleSelectionChange"
|
|
|
+ >
|
|
|
<el-table-column type="selection" width="55" align="center" />
|
|
|
- <el-table-column label="序号" type="index" width="50"> </el-table-column>
|
|
|
+ <el-table-column label="序号" type="index" width="50"> </el-table-column>
|
|
|
<el-table-column label="坐落号" align="center" prop="number" />
|
|
|
<el-table-column label="分栋号" align="center" prop="number1" />
|
|
|
<el-table-column label="分栋名称" align="center" prop="name" />
|
|
|
@@ -164,37 +186,55 @@
|
|
|
<el-table-column label="利用现状" align="center" prop="statusQuo" />
|
|
|
<el-table-column label="建筑年代" align="center" prop="period" />
|
|
|
<el-table-column label="建筑面积" align="center" prop="area" />
|
|
|
- <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
|
|
|
- <el-table-column label="录入时间" align="center" prop="createtime" width="150px">
|
|
|
- <template slot-scope="scope">
|
|
|
+ <el-table-column
|
|
|
+ label="备注"
|
|
|
+ align="center"
|
|
|
+ prop="remark"
|
|
|
+ show-overflow-tooltip
|
|
|
+ />
|
|
|
+ <el-table-column
|
|
|
+ label="录入时间"
|
|
|
+ align="center"
|
|
|
+ prop="createtime"
|
|
|
+ width="150px"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
<!-- <span>{{ parseTime(scope.row.arriveTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span> -->
|
|
|
- <span>{{ dateFormat('YYYY-mm-dd HH:MM:SS',scope.row.createtime) }}</span>
|
|
|
+ <span>{{
|
|
|
+ dateFormat("YYYY-mm-dd HH:MM:SS", scope.row.createtime)
|
|
|
+ }}</span>
|
|
|
<!-- rTime -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="楼房层数" align="center" prop="tier" />
|
|
|
<el-table-column label="房间号" align="center" prop="roomNumber" />
|
|
|
<el-table-column label="单元号" align="center" prop="element" />
|
|
|
- <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">
|
|
|
<el-button
|
|
|
size="btu"
|
|
|
type="text"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['barracksManagement:flat:edit']"
|
|
|
- >修改</el-button>
|
|
|
+ >修改</el-button
|
|
|
+ >
|
|
|
<el-button
|
|
|
size="btd"
|
|
|
type="text"
|
|
|
@click="handleDelete(scope.row)"
|
|
|
v-hasPermi="['barracksManagement:flat:remove']"
|
|
|
- >删除</el-button>
|
|
|
+ >删除</el-button
|
|
|
+ >
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
-
|
|
|
+
|
|
|
<pagination
|
|
|
- v-show="total>0"
|
|
|
+ v-show="total > 0"
|
|
|
:total="total"
|
|
|
:page.sync="queryParams.pageNum"
|
|
|
:limit.sync="queryParams.pageSize"
|
|
|
@@ -202,41 +242,57 @@
|
|
|
/>
|
|
|
|
|
|
<!-- 添加或修改公寓房档案对话框 -->
|
|
|
- <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
|
|
|
- <el-form ref="form" :model="form" :rules="rules" label-width="90px" :inline="true">
|
|
|
+ <el-dialog
|
|
|
+ :title="title"
|
|
|
+ :visible.sync="open"
|
|
|
+ width="800px"
|
|
|
+ append-to-body
|
|
|
+ :close-on-click-modal="false"
|
|
|
+ >
|
|
|
+ <el-form
|
|
|
+ ref="form"
|
|
|
+ :model="form"
|
|
|
+ :rules="rules"
|
|
|
+ label-width="90px"
|
|
|
+ :inline="true"
|
|
|
+ >
|
|
|
<el-form-item label="坐落号" prop="number">
|
|
|
- <el-input v-model="form.number" />
|
|
|
+ <el-input v-model="form.number" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="分栋号" prop="number1">
|
|
|
- <el-input v-model="form.number1"/>
|
|
|
+ <el-input v-model="form.number1" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="分栋名称" prop="name">
|
|
|
<el-input v-model="form.name" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="营房用途" prop="behoof">
|
|
|
- <el-input v-model="form.behoof" />
|
|
|
+ <el-input v-model="form.behoof" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="利用现状" prop="statusQuo">
|
|
|
- <el-input v-model="form.statusQuo" />
|
|
|
+ <el-input v-model="form.statusQuo" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="建筑年代" prop="period">
|
|
|
- <el-input v-model="form.period" />
|
|
|
+ <el-input v-model="form.period" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="建筑面积" prop="area">
|
|
|
- <el-input v-model="form.area" />
|
|
|
+ <el-input v-model="form.area" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="楼房层数" prop="tier">
|
|
|
<el-input v-model="form.tier" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="房间号" prop="roomNumber">
|
|
|
- <el-input v-model="form.roomNumber" />
|
|
|
+ <el-input v-model="form.roomNumber" />
|
|
|
</el-form-item>
|
|
|
<el-form-item label="单元号" prop="element">
|
|
|
- <el-input v-model="form.element" />
|
|
|
+ <el-input v-model="form.element" />
|
|
|
</el-form-item>
|
|
|
<div class="jibens">备注</div>
|
|
|
<el-form-item prop="remark">
|
|
|
- <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
|
|
|
+ <el-input
|
|
|
+ v-model="form.remark"
|
|
|
+ type="textarea"
|
|
|
+ placeholder="请输入内容"
|
|
|
+ />
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -248,7 +304,14 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { listFlat, getFlat, delFlat, addFlat, updateFlat, exportFlat } from "@/api/barracksManagement/flat";
|
|
|
+import {
|
|
|
+ listFlat,
|
|
|
+ getFlat,
|
|
|
+ delFlat,
|
|
|
+ addFlat,
|
|
|
+ updateFlat,
|
|
|
+ exportFlat,
|
|
|
+} from "@/api/barracksManagement/flat";
|
|
|
|
|
|
export default {
|
|
|
name: "Flat",
|
|
|
@@ -289,23 +352,43 @@ export default {
|
|
|
updatetime: null,
|
|
|
tier: null,
|
|
|
roomNumber: null,
|
|
|
- element: null
|
|
|
+ element: null,
|
|
|
},
|
|
|
// 表单参数
|
|
|
form: {},
|
|
|
// 表单校验
|
|
|
rules: {
|
|
|
- number: [{ required: true, message: "坐落号不能为空", trigger: "blur" }],
|
|
|
- number1: [{ required: true, message: "分栋号不能为空", trigger: "blur" }],
|
|
|
- name: [{ required: true, message: "分栋名称不能为空", trigger: "blur" }],
|
|
|
- behoof: [{ required: true, message: "营房用途不能为空", trigger: "blur" }],
|
|
|
- statusQuo: [{ required: true, message: "利用现状不能为空", trigger: "blur" }],
|
|
|
- roomNumber: [{ required: true, message: "房间号不能为空", trigger: "blur" }],
|
|
|
- element: [{ required: true, message: "单元号不能为空", trigger: "blur" }],
|
|
|
- period: [{ required: true, message: "建筑年代不能为空", trigger: "blur" }],
|
|
|
- area: [{ required: true, message: "建筑面积不能为空", trigger: "blur" }],
|
|
|
- tier: [{ required: true, message: "楼房层数不能为空", trigger: "blur" }],
|
|
|
- }
|
|
|
+ number: [
|
|
|
+ { required: true, message: "坐落号不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ number1: [
|
|
|
+ { required: true, message: "分栋号不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ name: [
|
|
|
+ { required: true, message: "分栋名称不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ behoof: [
|
|
|
+ { required: true, message: "营房用途不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ statusQuo: [
|
|
|
+ { required: true, message: "利用现状不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ roomNumber: [
|
|
|
+ { required: true, message: "房间号不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ element: [
|
|
|
+ { required: true, message: "单元号不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ period: [
|
|
|
+ { required: true, message: "建筑年代不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ area: [
|
|
|
+ { required: true, message: "建筑面积不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ tier: [
|
|
|
+ { required: true, message: "楼房层数不能为空", trigger: "blur" },
|
|
|
+ ],
|
|
|
+ },
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
@@ -313,32 +396,32 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
dateFormat(fmt, date) {
|
|
|
- let ret="";
|
|
|
- date=new Date(date);
|
|
|
+ let ret = "";
|
|
|
+ date = new Date(date);
|
|
|
const opt = {
|
|
|
- 'Y+': date.getFullYear().toString(), // 年
|
|
|
- 'm+': (date.getMonth() + 1).toString(), // 月
|
|
|
- 'd+': date.getDate().toString(), // 日
|
|
|
- 'H+': date.getHours().toString(), // 时
|
|
|
- 'M+': date.getMinutes().toString(), // 分
|
|
|
- 'S+': date.getSeconds().toString() // 秒
|
|
|
+ "Y+": date.getFullYear().toString(), // 年
|
|
|
+ "m+": (date.getMonth() + 1).toString(), // 月
|
|
|
+ "d+": date.getDate().toString(), // 日
|
|
|
+ "H+": date.getHours().toString(), // 时
|
|
|
+ "M+": date.getMinutes().toString(), // 分
|
|
|
+ "S+": date.getSeconds().toString(), // 秒
|
|
|
// 有其他格式化字符需求可以继续添加，必须转化成字符串
|
|
|
- }
|
|
|
+ };
|
|
|
for (let k in opt) {
|
|
|
- ret = new RegExp('(' + k + ')').exec(fmt)
|
|
|
+ ret = new RegExp("(" + k + ")").exec(fmt);
|
|
|
if (ret) {
|
|
|
fmt = fmt.replace(
|
|
|
ret[1],
|
|
|
- ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
|
|
|
- )
|
|
|
+ ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, "0")
|
|
|
+ );
|
|
|
}
|
|
|
}
|
|
|
- return fmt
|
|
|
+ return fmt;
|
|
|
},
|
|
|
/** 查询公寓房档案列表 */
|
|
|
getList() {
|
|
|
this.loading = true;
|
|
|
- listFlat(this.queryParams).then(response => {
|
|
|
+ listFlat(this.queryParams).then((response) => {
|
|
|
this.flatList = response.rows;
|
|
|
this.total = response.total;
|
|
|
this.loading = false;
|
|
|
@@ -365,7 +448,7 @@ export default {
|
|
|
updatetime: null,
|
|
|
tier: null,
|
|
|
roomNumber: null,
|
|
|
- element: null
|
|
|
+ element: null,
|
|
|
};
|
|
|
this.resetForm("form");
|
|
|
},
|
|
|
@@ -381,9 +464,9 @@ export default {
|
|
|
},
|
|
|
// 多选框选中数据
|
|
|
handleSelectionChange(selection) {
|
|
|
- this.ids = selection.map(item => item.id)
|
|
|
- this.single = selection.length!==1
|
|
|
- this.multiple = !selection.length
|
|
|
+ this.ids = selection.map((item) => item.id);
|
|
|
+ this.single = selection.length !== 1;
|
|
|
+ this.multiple = !selection.length;
|
|
|
},
|
|
|
/** 新增按钮操作 */
|
|
|
handleAdd() {
|
|
|
@@ -394,8 +477,8 @@ export default {
|
|
|
/** 修改按钮操作 */
|
|
|
handleUpdate(row) {
|
|
|
this.reset();
|
|
|
- const id = row.id || this.ids
|
|
|
- getFlat(id).then(response => {
|
|
|
+ const id = row.id || this.ids;
|
|
|
+ getFlat(id).then((response) => {
|
|
|
this.form = response.data;
|
|
|
this.open = true;
|
|
|
this.title = "修改公寓房档案";
|
|
|
@@ -403,16 +486,16 @@ export default {
|
|
|
},
|
|
|
/** 提交按钮 */
|
|
|
submitForm() {
|
|
|
- this.$refs["form"].validate(valid => {
|
|
|
+ this.$refs["form"].validate((valid) => {
|
|
|
if (valid) {
|
|
|
if (this.form.id != null) {
|
|
|
- updateFlat(this.form).then(response => {
|
|
|
+ updateFlat(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("修改成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
});
|
|
|
} else {
|
|
|
- addFlat(this.form).then(response => {
|
|
|
+ addFlat(this.form).then((response) => {
|
|
|
this.$modal.msgSuccess("新增成功");
|
|
|
this.open = false;
|
|
|
this.getList();
|
|
|
@@ -424,68 +507,77 @@ export default {
|
|
|
/** 删除按钮操作 */
|
|
|
handleDelete(row) {
|
|
|
const ids = row.id || this.ids;
|
|
|
- this.$modal.confirm('是否确认删除？').then(function() {
|
|
|
- return delFlat(ids);
|
|
|
- }).then(() => {
|
|
|
- this.getList();
|
|
|
- this.$modal.msgSuccess("删除成功");
|
|
|
- }).catch(() => {});
|
|
|
+ this.$modal
|
|
|
+ .confirm("是否确认删除？")
|
|
|
+ .then(function () {
|
|
|
+ return delFlat(ids);
|
|
|
+ })
|
|
|
+ .then(() => {
|
|
|
+ this.getList();
|
|
|
+ this.$modal.msgSuccess("删除成功");
|
|
|
+ })
|
|
|
+ .catch(() => {});
|
|
|
},
|
|
|
/** 导出按钮操作 */
|
|
|
handleExport() {
|
|
|
const queryParams = this.queryParams;
|
|
|
- this.$modal.confirm('是否确认导出所有公寓房档案数据项？').then(() => {
|
|
|
- this.exportLoading = true;
|
|
|
- return exportFlat(queryParams);
|
|
|
- }).then(response => {
|
|
|
- this.$download.name(response.msg);
|
|
|
- this.exportLoading = false;
|
|
|
- }).catch(() => {});
|
|
|
- }
|
|
|
- }
|
|
|
+ this.$modal
|
|
|
+ .confirm("是否确认导出所有公寓房档案数据项？")
|
|
|
+ .then(() => {
|
|
|
+ this.exportLoading = true;
|
|
|
+ return exportFlat(queryParams);
|
|
|
+ })
|
|
|
+ .then((response) => {
|
|
|
+ this.$download.name(response.msg);
|
|
|
+ this.exportLoading = false;
|
|
|
+ })
|
|
|
+ .catch(() => {});
|
|
|
+ },
|
|
|
+ },
|
|
|
};
|
|
|
</script>
|
|
|
<style scoped>
|
|
|
-::v-deep .el-dialog{
|
|
|
- background-color: #004d86 !important;
|
|
|
+::v-deep .el-dialog {
|
|
|
+ background-color: #004d86 !important;
|
|
|
}
|
|
|
/* 输入框 */
|
|
|
-::v-deep .el-dialog .el-input__inner{
|
|
|
+::v-deep .el-dialog .el-input__inner {
|
|
|
background-color: #004d86 !important;
|
|
|
width: 220px;
|
|
|
color: white;
|
|
|
margin-right: 20px;
|
|
|
}
|
|
|
/* 标题弹框 */
|
|
|
-::v-deep .el-dialog__title{
|
|
|
+::v-deep .el-dialog__title {
|
|
|
color: white;
|
|
|
/* border-bottom: 1px solid white; */
|
|
|
}
|
|
|
/* 标题下划线 */
|
|
|
-::v-deep .el-dialog__header{
|
|
|
+::v-deep .el-dialog__header {
|
|
|
border-bottom: 1px solid white;
|
|
|
}
|
|
|
/* 文本域 */
|
|
|
-::v-deep .el-textarea__inner{
|
|
|
+::v-deep .el-textarea__inner {
|
|
|
width: 650px;
|
|
|
height: 80px;
|
|
|
}
|
|
|
-::v-deep .el-form-item__label{
|
|
|
+::v-deep .el-form-item__label {
|
|
|
text-align: end;
|
|
|
}
|
|
|
-::v-deep .el-dialog__body{
|
|
|
+::v-deep .el-dialog__body {
|
|
|
padding: 0px;
|
|
|
- margin-left: 20px;
|
|
|
+ margin-left: 75px;
|
|
|
margin-top: 20px;
|
|
|
}
|
|
|
-::v-deep .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th {
|
|
|
- background-color:rgb(0, 60, 105);
|
|
|
+::v-deep .el-table .el-table__header-wrapper th,
|
|
|
+.el-table .el-table__fixed-header-wrapper th {
|
|
|
+ background-color: rgb(0, 60, 105);
|
|
|
color: white;
|
|
|
}
|
|
|
-::v-deep .el-input--small .el-input__inner{
|
|
|
+::v-deep .el-input--small .el-input__inner {
|
|
|
color: white;
|
|
|
}
|
|
|
-::v-deep .el-table__cell .cell{
|
|
|
+::v-deep .el-table__cell .cell {
|
|
|
text-align: center;
|
|
|
}
|
|
|
/* 文字多余部分省略 */
|
|
|
@@ -494,14 +586,16 @@ export default {
|
|
|
text-overflow: ellipsis;
|
|
|
white-space: nowrap;
|
|
|
}
|
|
|
-.jibens{
|
|
|
+.jibens {
|
|
|
width: 650px;
|
|
|
height: 32px;
|
|
|
- background-image:url("/static/img/小标题底.b7c6f45a.png");
|
|
|
+ background-image: url("/static/img/小标题底.b7c6f45a.png");
|
|
|
margin-bottom: 25px;
|
|
|
- color: #fff;
|
|
|
- padding-left: 16px;
|
|
|
- line-height: 32px;
|
|
|
+ color: #fff;
|
|
|
+ padding-left: 16px;
|
|
|
+ line-height: 32px;
|
|
|
+}
|
|
|
+::v-deep .el-dialog__footer {
|
|
|
+ margin-right: 54px;
|
|
|
}
|
|
|
-
|
|
|
</style>
|
sunyanqiang