hansha
/
szxc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

巡查记录页面联调

Browse Source
main
wanglei 2 years ago
parent ee04c80924
commit fd4880f696
1 changed files with 275 additions and 144 deletions
Show Stats Download Patch File Download Diff File

417
ruoyi-ui/src/views/szxc/xcrecard/index.vue
Unescape View File

@ -1,6 +1,18 @@
<template>
<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="100px">
<el-form-item label="所属网格" prop="deptId">
<treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
placeholder="请选择所属网格"/>
</el-form-item>
<el-form-item label="巡查主题" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入巡查主题"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巡查人" prop="xcName">
<el-input
v-model="queryParams.xcName"
@ -9,6 +21,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巡查类别" prop="type">
<el-select
v-model="queryParams.type"
placeholder="巡查类别"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_xc_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="提报日期" prop="submitDate">
<el-date-picker clearable
v-model="queryParams.submitDate"
@ -25,14 +52,6 @@
placeholder="请选择巡查日期">
</el-date-picker>
</el-form-item>
<el-form-item label="巡查对像id" prop="jmId">
<el-input
v-model="queryParams.jmId"
placeholder="请输入巡查对像id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="被巡查对象" prop="xcObj">
<el-input
v-model="queryParams.xcObj"
@ -41,22 +60,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巡查主题" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入巡查主题"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="图片" prop="picture">
<el-input
v-model="queryParams.picture"
placeholder="请输入图片"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="随行巡查人" prop="flowPeople">
<el-input
v-model="queryParams.flowPeople"
@ -66,52 +69,19 @@
/>
</el-form-item>
<el-form-item label="是否需要整改" prop="reform">
<el-input
<el-select
v-model="queryParams.reform"
placeholder="请输入是否需要整改"
placeholder="巡查类别"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="整改进度" prop="zgProgress">
<el-input
v-model="queryParams.zgProgress"
placeholder="请输入整改进度"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核备注" prop="shRemark">
<el-input
v-model="queryParams.shRemark"
placeholder="请输入审核备注"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input
v-model="queryParams.deptId"
placeholder="请输入部门id"
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="创建者ID" prop="userId">
<el-input
v-model="queryParams.userId"
placeholder="请输入创建者ID"
clearable
@keyup.enter.native="handleQuery"
/>
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_yes_no"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -165,35 +135,49 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="xcrecardList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="巡查人" align="center" prop="xcName" />
<el-table-column label="提报日期" align="center" prop="submitDate" width="180">
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="所属网格" align="center" prop="deptName" min-width="120" show-overflow-tooltip/>
<el-table-column label="巡查主题" align="center" prop="title" min-width="120" show-overflow-tooltip/>
<el-table-column label="巡查人" align="center" prop="xcName" min-width="120" show-overflow-tooltip/>
<el-table-column label="提报日期" align="center" prop="submitDate" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.submitDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="巡查日期" align="center" prop="xcDate" width="180">
<el-table-column label="巡查日期" align="center" prop="xcDate" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ parseTime(scope.row.xcDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="巡查类别" align="center" prop="type" />
<el-table-column label="巡查对像id" align="center" prop="jmId" />
<el-table-column label="被巡查对象" align="center" prop="xcObj" />
<el-table-column label="巡查主题" align="center" prop="title" />
<el-table-column label="图片" align="center" prop="picture" />
<el-table-column label="巡查情况描述" align="center" prop="content" />
<el-table-column label="随行巡查人" align="center" prop="flowPeople" />
<el-table-column label="是否需要整改" align="center" prop="reform" />
<el-table-column label="整改进度" align="center" prop="zgProgress" />
<el-table-column label="审核状态" align="center" prop="xcStatus" />
<el-table-column label="审核备注" align="center" prop="shRemark" />
<el-table-column label="部门id" align="center" prop="deptId" />
<el-table-column label="所属网格" align="center" prop="deptName" />
<el-table-column label="创建者ID" align="center" prop="userId" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="巡查类别" align="center" prop="type" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_xc_type" :value="scope.row.type"/>
</template>
</el-table-column>
<el-table-column label="被巡查对象" align="center" prop="xcObj" min-width="120" show-overflow-tooltip/>
<el-table-column label="随行巡查人" align="center" prop="flowPeople" min-width="120" show-overflow-tooltip/>
<el-table-column label="是否需要整改" align="center" prop="reform" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_yes_no" :value="scope.row.reform"/>
</template>
</el-table-column>
<el-table-column label="整改进度" align="center" prop="zgProgress" min-width="120" show-overflow-tooltip/>
<el-table-column label="审核状态" align="center" prop="xcStatus" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_audit_status" :value="scope.row.xcStatus"/>
</template>
</el-table-column>
<el-table-column label="审核备注" align="center" prop="shRemark" min-width="120" show-overflow-tooltip/>
<el-table-column label="图片" align="center" prop="picture" >
<template slot-scope="scope">
<image-preview :src="scope.row.picture" :width="50" :height="50"/>
</template>
</el-table-column>
<el-table-column label="巡查情况描述" align="center" prop="content" min-width="200" show-overflow-tooltip/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="220">
<template slot-scope="scope">
<el-button
size="mini"
@ -209,6 +193,13 @@
@click="handleDelete(scope.row)"
v-hasPermi="['szxc:xcrecard:remove']"
>删除</el-button>
<el-button
v-if="scope.row.reform==='0'"
size="mini"
type="text"
@click="handleUpdate1(scope.row)"
v-hasPermi="['szxc:xcrecard:edit']"
>整改进度</el-button>
</template>
</el-table-column>
</el-table>
@ -222,62 +213,136 @@
/>
<!-- 添加或修改巡查记录对话框 -->
<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="巡查人" prop="xcName">
<el-input v-model="form.xcName" placeholder="请输入巡查人" />
</el-form-item>
<el-form-item label="提报日期" prop="submitDate">
<el-date-picker clearable
v-model="form.submitDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择提报日期">
</el-date-picker>
</el-form-item>
<el-form-item label="巡查日期" prop="xcDate">
<el-date-picker clearable
v-model="form.xcDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择巡查日期">
</el-date-picker>
</el-form-item>
<el-form-item label="巡查对像id" prop="jmId">
<el-input v-model="form.jmId" placeholder="请输入巡查对像id" />
</el-form-item>
<el-form-item label="被巡查对象" prop="xcObj">
<el-input v-model="form.xcObj" placeholder="请输入被巡查对象" />
</el-form-item>
<el-form-item label="巡查主题" prop="title">
<el-input v-model="form.title" placeholder="请输入巡查主题" />
</el-form-item>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="巡查主题" prop="title">
<el-input v-model="form.title" placeholder="请输入巡查主题" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属网格" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="巡查人" prop="xcName">
<el-input v-model="form.xcName" placeholder="请输入巡查人" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="提报日期" prop="submitDate">
<el-date-picker clearable style="width: 100%"
v-model="form.submitDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择提报日期">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="巡查日期" prop="xcDate">
<el-date-picker clearable style="width: 100%"
v-model="form.xcDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择巡查日期">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="巡查类别" prop="type">
<el-select
v-model="form.type"
placeholder="巡查类别"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_xc_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="被巡查对象" prop="xcObj">
<el-input v-model="form.xcObj" placeholder="请输入被巡查对象" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="随行巡查人" prop="flowPeople">
<el-input v-model="form.flowPeople" placeholder="请输入随行巡查人" />
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="12">
<el-form-item label="是否需要整改" prop="reform">
<el-radio-group v-model="form.reform">
<el-radio
v-for="dict in dict.type.szxc_yes_no"
:key="dict.value"
:label="dict.value"
>{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="审核状态" prop="xcStatus">
<el-select
v-model="form.xcStatus"
placeholder="审核状态"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_audit_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="图片" prop="picture">
<el-input v-model="form.picture" placeholder="请输入图片" />
<image-upload v-model="form.picture"/>
</el-form-item>
<el-form-item label="巡查情况描述">
<el-form-item label="巡查情况描述" prop="content">
<editor v-model="form.content" :min-height="192"/>
</el-form-item>
<el-form-item label="随行巡查人" prop="flowPeople">
<el-input v-model="form.flowPeople" placeholder="请输入随行巡查人" />
</el-form-item>
<el-form-item label="是否需要整改" prop="reform">
<el-input v-model="form.reform" placeholder="请输入是否需要整改" />
</el-form-item>
<el-form-item label="整改进度" prop="zgProgress">
<el-input v-model="form.zgProgress" placeholder="请输入整改进度" />
</el-form-item>
<el-form-item label="审核备注" prop="shRemark">
<el-input v-model="form.shRemark" placeholder="请输入审核备注" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id" />
<el-input v-model="form.shRemark" type="textarea" placeholder="请输入审核备注" />
</el-form-item>
<el-form-item label="所属网格" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入所属网格" />
</el-form-item>
<el-form-item label="创建者ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入创建者ID" />
</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>
<!-- 整改进度 -->
<el-dialog title="整改进度" :visible.sync="zg_open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="整改进度" prop="zgProgress">
<el-input v-model="form.zgProgress" type="textarea" placeholder="请输入整改进度" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -290,9 +355,14 @@
<script>
import { listXcrecard, getXcrecard, delXcrecard, addXcrecard, updateXcrecard } from "@/api/szxc/xcrecard";
import { deptTreeSelect } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Xcrecard",
components: { Treeselect },
dicts: ['szxc_yes_no', 'szxc_audit_status', 'szxc_xc_type'],
data() {
return {
// 遮罩层
@ -308,11 +378,15 @@ export default {
// 总条数
total: 0,
// 巡查记录表格数据
xcrecardList: [],
list: [],
// 组织树选项
deptOptions: undefined,
// 弹出层标题
title: "",
// 是否显示弹出层
open: false,
// 是否显示整改进度弹出层
zg_open: false,
// 查询参数
queryParams: {
pageNum: 1,
@ -339,24 +413,71 @@ export default {
form: {},
// 表单校验
rules: {
title: [
{ required: true, message: "巡查主题不能为空", trigger: "blur" }
],
deptId: [
{ required: true, message: "所属网格不能为空", trigger: "blur" }
],
xcName: [
{ required: true, message: "巡查人不能为空", trigger: "blur" }
],
title: [
{ required: true, message: "巡查主题不能为空", trigger: "blur" }
submitDate: [
{ required: true, message: "提报日期不能为空", trigger: "blur" }
],
xcDate: [
{ required: true, message: "巡查日期不能为空", trigger: "blur" }
],
type: [
{ required: true, message: "巡查类别不能为空", trigger: "blur" }
],
xcObj: [
{ required: true, message: "被巡查对象不能为空", trigger: "blur" }
],
flowPeople: [
{ required: true, message: "随行巡查人不能为空", trigger: "blur" }
],
reform: [
{ required: true, message: "是否需要整改不能为空", trigger: "blur" }
],
xcStatus: [
{ required: true, message: "审核状态不能为空", trigger: "blur" }
],
picture: [
{ required: true, message: "图片不能为空", trigger: "blur" }
],
content: [
{ required: true, message: "巡查情况描述不能为空", trigger: "blur" }
],
shRemark: [
{ required: true, message: "审核备注不能为空", trigger: "blur" }
],
zgProgress: [
{ required: true, message: "整改进度不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
this.getDeptTree();
},
methods: {
/** 查询组织下拉树结构 */
getDeptTree() {
deptTreeSelect().then(response => {
this.deptOptions = response.data;
});
},
selectedTree(node){
this.form.deptId = node.id;
this.form.deptName = node.label;
},
/** 查询巡查记录列表 */
getList() {
this.loading = true;
listXcrecard(this.queryParams).then(response => {
this.xcrecardList = response.rows;
this.list = response.rows;
this.total = response.total;
this.loading = false;
});
@ -426,6 +547,15 @@ export default {
this.title = "修改巡查记录";
});
},
/** 整改进度按钮操作 */
handleUpdate1(row) {
this.reset();
const id = row.id || this.ids
getXcrecard(id).then(response => {
this.form = response.data;
this.zg_open = true;
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
@ -434,6 +564,7 @@ export default {
updateXcrecard(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.zg_open = false;
this.getList();
});
} else {

Write Preview
Loading…
Cancel
Save