Skip to content

R
rongtong-pc
Commit bd761e36 authored by kaitly205422@163.com's avatar kaitly205422@163.com
Browse files
Options

Merge branch 'develop' of http://git.censoft.com.cn/rongtong/ruoyi-ui into develop

parents 0fb6e916 54be210b
Hide whitespace changes
Inline Side-by-side
Showing with 373 additions and 37 deletions
src/api/system/record.js 0 → 100644
View file @ bd761e36
import request from '@/utils/request'
// 查询签到签退记录列表
export function listRecord(query) {
return request({
url: '/system/record/list',
method: 'get',
params: query
})
}
// 查询签到签退记录详细
export function getRecord(id) {
return request({
url: '/system/record/' + id,
method: 'get'
})
}
// 新增签到签退记录
export function addRecord(data) {
return request({
url: '/system/record',
method: 'post',
data: data
})
}
// 修改签到签退记录
export function updateRecord(data) {
return request({
url: '/system/record',
method: 'put',
data: data
})
}
// 删除签到签退记录
export function delRecord(id) {
return request({
url: '/system/record/' + id,
method: 'delete'
})
}
src/views/ledger/project/index.vue
View file @ bd761e36
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="项目类型" prop="type"> <el-form-item label="经营状态" prop="businessStatus">
<el-input <el-input
v-model="queryParams.type" v-model="queryParams.businessStatus"
placeholder="请输入项目类型" placeholder="请输入经营状态"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -64,6 +64,16 @@ ...@@ -64,6 +64,16 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物业" prop="propertyManagement">
<el-select
v-model="queryParams.propertyManagement"
placeholder="请选择是否为物业"
clearable
>
<el-option key="1" label="是" value="true" />
<el-option key="0" label="否" value="false" />
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status"> <el-form-item label="状态" prop="status">
<el-select <el-select
v-model="queryParams.status" v-model="queryParams.status"
......
src/views/risk/existing/index.vue
View file @ bd761e36
...@@ -8,55 +8,50 @@ ...@@ -8,55 +8,50 @@
v-show="showSearch" v-show="showSearch"
label-width="90px" label-width="90px"
> >
<el-form-item label="区域公司" prop="name"> <el-form-item label="区域公司" prop="deptName">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.deptName"
placeholder="请输入区域公司" placeholder="请输入区域公司"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="项目名称" prop="projectName">
<el-form-item label="风险名称" prop="name">
<el-input <el-input
v-model="queryParams.name" v-model="queryParams.projectName"
placeholder="请输入风险名称" placeholder="请输入项目名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="楼宇名称" prop="buildingName"> <el-form-item label="所属城市" prop="city">
<el-input <el-input
v-model="queryParams.buildingName" v-model="queryParams.city"
placeholder="请输入楼宇名称" placeholder="请输入所属城市"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="楼层名称" prop="floorName"> <el-form-item label="项目业态" prop="businessFormat">
<el-input <el-input
v-model="queryParams.floorName" v-model="queryParams.businessFormat"
placeholder="请输入楼层名称" placeholder="请输入项目业态"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="房间名称" prop="roomName"> <el-form-item label="固有风险危险源名称" prop="inherentName">
<el-input <el-input
v-model="queryParams.roomName" v-model="queryParams.inherentName"
placeholder="请输入房间名称" placeholder="请输入固有风险危险源名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="风险等级" prop="level"> <el-form-item label="固有风险风险等级" prop="inherentLevel">
<el-select <el-select
v-model="queryParams.level" v-model="queryParams.inherentLevel"
placeholder="请选择风险等级" placeholder="请选择固有风险风险等级"
clearable clearable
> >
<el-option <el-option
...@@ -67,26 +62,40 @@ ...@@ -67,26 +62,40 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="风险因素" prop="factor"> <el-form-item label="现有风险危险源名称" prop="existingName">
<el-input <el-input
v-model="queryParams.factor" v-model="queryParams.existingName"
placeholder="请输入风险因素" placeholder="请输入现有风险危险源名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="准事故类型" prop="type"> <el-form-item label="现有风险风险等级" prop="existingLevel">
<el-select
v-model="queryParams.existingLevel"
placeholder="请选择现有风险风险等级"
clearable
>
<el-option
v-for="dict in dict.type.risk_plan_level"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="风险点位置" prop="presenceLocation">
<el-input <el-input
v-model="queryParams.type" v-model="queryParams.presenceLocation"
placeholder="请输入准事故类型" placeholder="请输入风险点位置"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="存在部位" prop="presenceLocation"> <el-form-item label="可能导致的事故后果" prop="listType">
<el-input <el-input
v-model="queryParams.presenceLocation" v-model="queryParams.listType"
placeholder="请输入存在部位" placeholder="请输入可能导致的事故后果"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
...@@ -106,11 +115,21 @@ ...@@ -106,11 +115,21 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row class="mb8"> <el-row class="mb8">
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
>导出</el-button
>
</el-col>
<right-toolbar <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@queryTable="getList" @queryTable="getList">
></right-toolbar </right-toolbar>
></el-row> </el-row>
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="inherentList" :data="inherentList"
...@@ -370,6 +389,16 @@ export default { ...@@ -370,6 +389,16 @@ export default {
}, },
}); });
}, },
/** 导出按钮操作 */
handleExport() {
this.download(
"/system/risk/plan/exportExcel/InherentList",
{
...this.queryParams,
},
`固有风险台账_${new Date().getTime()}.xls`
);
},
}, },
}; };
</script> </script>
src/views/system/record/index.vue 0 → 100644
View file @ bd761e36
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="用户名称" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="项目名称" prop="projectName">
<el-input
v-model="queryParams.projectName"
placeholder="请输入项目名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所属区域" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入所属区域"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<el-table-column label="类型" align="center" prop="type" :formatter="typeFormatter" />
<el-table-column label="用户姓名" align="center" prop="userName" />
<el-table-column label="项目名称" align="center" prop="projectName" />
<el-table-column label="所属区域" align="center" prop="deptName" />
<el-table-column label="记录时间" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改签到签退记录对话框 -->
<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-item label="用户id" prop="userId">
<el-input v-model="form.userId" placeholder="请输入用户id" />
</el-form-item>
<el-form-item label="项目id" prop="projectId">
<el-input v-model="form.projectId" placeholder="请输入项目id" />
</el-form-item>
<el-form-item label="文件ids" prop="fileIds">
<el-input v-model="form.fileIds" placeholder="请输入文件ids" />
</el-form-item>
<el-form-item label="删除标志" prop="delFlag">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/system/record";
export default {
name: "Record",
data() {
return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 签到签退记录表格数据
recordList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
type: null,
userId: null,
projectId: null,
fileIds: null,
// 日期范围
dateRange: [],
},
// 表单参数
form: {},
// 表单校验
rules: {
}
};
},
created() {
this.getList();
},
methods: {
/** 查询签到签退记录列表 */
getList() {
this.loading = true;
listRecord(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.recordList = response.rows;
this.total = response.total;
this.loading = false;
});
},
// 取消按钮
cancel() {
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
type: null,
userId: null,
projectId: null,
fileIds: null,
delFlag: null,
createBy: null,
createTime: null,
updateBy: null,
updateTime: null,
remark: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
this.handleQuery();
},
// 多选框选中数据
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加签到签退记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids
getRecord(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改签到签退记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateRecord(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addRecord(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids;
this.$modal.confirm('是否确认删除签到签退记录编号为"' + ids + '"的数据项？').then(function() {
return delRecord(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('system/record/export', {
...this.queryParams
}, `record_${new Date().getTime()}.xlsx`)
},
typeFormatter(value) {
if(value = true){
return '签到';
}else{
return '签退';
}
},
}
};
</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