Skip to content

D
data_management_system
Commit d901ce48 authored by 秦嘉's avatar 秦嘉
Browse files
Options

解除隔离人员

parent 19c12c11
Hide whitespace changes
Inline Side-by-side
Showing with 282 additions and 148 deletions
ruoyi-ui/src/views/system/jcglry/index.vue
View file @ d901ce48
<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="auto">
<el-form-item label="是否区内" prop="isArea"> <el-form-item label="是否区内" prop="isArea">
<el-select v-model="queryParams.isArea" placeholder="请选择是否区内" clearable> <el-select v-model="queryParams.isArea" placeholder="请选择是否区内" clearable>
<el-option <el-option
...@@ -21,18 +21,20 @@ ...@@ -21,18 +21,20 @@
</el-form-item> </el-form-item>
<el-form-item label="隔离时间" prop="rzTime"> <el-form-item label="隔离时间" prop="rzTime">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.rzTime" v-model="queryParams.rzTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd"
placeholder="请选择隔离时间"> placeholder="请选择隔离时间"
style="width: 205px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="解除时间" prop="jcTime"> <el-form-item label="解除时间" prop="jcTime">
<el-date-picker clearable <el-date-picker clearable
v-model="queryParams.jcTime" v-model="queryParams.jcTime"
type="datetime" type="datetime"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd"
placeholder="请选择解除时间"> placeholder="请选择解除时间"
style="width: 205px">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="人员类别" prop="rylb"> <el-form-item label="人员类别" prop="rylb">
...@@ -108,7 +110,8 @@ ...@@ -108,7 +110,8 @@
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['system:jcglry:add']" v-hasPermi="['system:jcglry:add']"
>新增</el-button> >新增
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -119,7 +122,8 @@ ...@@ -119,7 +122,8 @@
:disabled="single" :disabled="single"
@click="handleUpdate" @click="handleUpdate"
v-hasPermi="['system:jcglry:edit']" v-hasPermi="['system:jcglry:edit']"
>修改</el-button> >修改
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -130,7 +134,8 @@ ...@@ -130,7 +134,8 @@
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['system:jcglry:remove']" v-hasPermi="['system:jcglry:remove']"
>删除</el-button> >删除
</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
...@@ -140,68 +145,77 @@ ...@@ -140,68 +145,77 @@
size="mini" size="mini"
@click="handleExport" @click="handleExport"
v-hasPermi="['system:jcglry:export']" v-hasPermi="['system:jcglry: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>
</el-row> </el-row>
<el-table v-loading="loading" :data="jcglryList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="jcglryList" @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="主键" align="center" prop="id" /> <!-- <el-table-column label="主键" align="center" prop="id"/>-->
<el-table-column label="是否区内" align="center" prop="isArea"> <el-table-column label="是否区内" align="center" width="80" prop="isArea" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.is_area" :value="scope.row.isArea"/> <dict-tag :options="dict.type.is_area" :value="scope.row.isArea"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="姓名" width="100" align="center" prop="name" :show-overflow-tooltip="true"/>
<el-table-column label="隔离位置" align="center" prop="glPlace" /> <el-table-column label="隔离位置" width="100" align="center" prop="glPlace" :show-overflow-tooltip="true"/>
<el-table-column label="隔离时间" align="center" prop="rzTime" width="180"> <el-table-column label="隔离时间" align="center" prop="rzTime" width="100" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.rzTime) }}</span> <span>{{ parseTime(scope.row.rzTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="解除时间" align="center" prop="jcTime" width="180"> <el-table-column label="解除时间" align="center" prop="jcTime" width="100" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.jcTime) }}</span> <span>{{ parseTime(scope.row.jcTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="人员类别" align="center" prop="rylb" /> <el-table-column label="人员类别" width="100" align="center" prop="rylb" :show-overflow-tooltip="true"/>
<el-table-column label="身份证号码" align="center" prop="cardNo" /> <el-table-column label="身份证号码" width="180" align="center" prop="cardNo" :show-overflow-tooltip="true"/>
<el-table-column label="联系方式" align="center" prop="phone" /> <el-table-column label="联系方式" width="140" align="center" prop="phone" :show-overflow-tooltip="true"/>
<el-table-column label="街道/镇" align="center" prop="street" /> <el-table-column label="街道/镇" width="100" align="center" prop="street" :show-overflow-tooltip="true"/>
<el-table-column label="居委会" align="center" prop="committee" /> <el-table-column label="居委会" width="100" align="center" prop="committee" :show-overflow-tooltip="true"/>
<el-table-column label="小区/村名称" align="center" prop="community" /> <el-table-column label="小区/村名称" width="120" align="center" prop="community" :show-overflow-tooltip="true"/>
<el-table-column label="家庭住址" align="center" prop="address" /> <el-table-column label="家庭住址" width="100" align="center" prop="address" :show-overflow-tooltip="true"/>
<el-table-column label="转运状态" align="center" prop="zyStatus" /> <el-table-column label="转运状态" align="center" prop="zyStatus"/>
<el-table-column label="是否安排司机" align="center" prop="arrangeDrivers"> <el-table-column label="是否安排司机" align="center" prop="arrangeDrivers" width="140" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.arrange_drivers" :value="scope.row.arrangeDrivers"/> <dict-tag :options="dict.type.arrange_drivers" :value="scope.row.arrangeDrivers"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注街道" align="center" prop="bzStreet" /> <el-table-column label="备注街道" align="center" prop="bzStreet" :show-overflow-tooltip="true"/>
<el-table-column label="备注住址" align="center" prop="bzAddress" /> <el-table-column label="备注住址" align="center" prop="bzAddress" :show-overflow-tooltip="true"/>
<el-table-column label="状态" align="center" prop="status" /> <!-- <el-table-column label="状态" align="center" prop="status"/>-->
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" width="120" align="center" prop="remark" :show-overflow-tooltip="true"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-zoom-in"
@click="handleDetails(scope.row)"
>查看</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:jcglry:edit']" v-hasPermi="['system:jcglry: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:jcglry:remove']" v-hasPermi="['system:jcglry: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"
...@@ -211,71 +225,168 @@ ...@@ -211,71 +225,168 @@
/> />
<!-- 添加或修改解除隔离人员对话框 --> <!-- 添加或修改解除隔离人员对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form :disabled="title ==='查看解除隔离人员'" ref="form" :model="form" :rules="rules" label-width="auto">
<el-form-item label="是否区内" prop="isArea"> <el-row>
<el-select v-model="form.isArea" placeholder="请选择是否区内"> <el-col :span="12">
<el-option <el-form-item label="是否区内" prop="isArea">
v-for="dict in dict.type.is_area" <el-select style="width: 90%" v-model="form.isArea" placeholder="请选择是否区内">
:key="dict.value" <el-option
:label="dict.label" v-for="dict in dict.type.is_area"
:value="dict.value" :key="dict.value"
></el-option> :label="dict.label"
</el-select> :value="dict.value"
</el-form-item> ></el-option>
<el-form-item label="姓名" prop="name"> </el-select>
<el-input v-model="form.name" placeholder="请输入姓名" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="隔离时间" prop="rzTime"> <el-col :span="12">
<el-date-picker clearable <el-form-item label="姓名" prop="name">
v-model="form.rzTime" <el-input style="width: 90%" v-model="form.name" placeholder="请输入姓名"/>
type="datetime" </el-form-item>
value-format="yyyy-MM-dd HH:mm:ss" </el-col>
placeholder="请选择隔离时间"> </el-row>
</el-date-picker> <el-row>
</el-form-item> <el-col :span="12">
<el-form-item label="解除时间" prop="jcTime"> <el-form-item label="隔离位置" prop="glPlace">
<el-date-picker clearable <el-select style="width: 90%" v-model="form.glPlace" placeholder="请选择隔离位置">
v-model="form.jcTime" <el-option
type="datetime" v-for="dict in geliList"
value-format="yyyy-MM-dd HH:mm:ss" :key="dict.value"
placeholder="请选择解除时间"> :label="dict.label"
</el-date-picker> :value="dict.value"
</el-form-item> ></el-option>
<el-form-item label="人员类别" prop="rylb"> </el-select>
<el-input v-model="form.rylb" placeholder="请输入人员类别" /> </el-form-item>
</el-form-item> </el-col>
<el-form-item label="身份证号码" prop="cardNo"> <el-col :span="12">
<el-input v-model="form.cardNo" placeholder="请输入身份证号码" /> <el-form-item label="隔离时间" prop="rzTime">
</el-form-item> <el-date-picker clearable
<el-form-item label="联系方式" prop="phone"> v-model="form.rzTime"
<el-input v-model="form.phone" placeholder="请输入联系方式" /> type="datetime"
</el-form-item> style="width: 90%"
<el-form-item label="家庭住址" prop="address"> value-format="yyyy-MM-dd HH:mm:ss"
<el-input v-model="form.address" placeholder="请输入家庭住址" /> placeholder="请选择隔离时间">
</el-form-item> </el-date-picker>
<el-form-item label="是否安排司机" prop="arrangeDrivers"> </el-form-item>
<el-select v-model="form.arrangeDrivers" placeholder="请选择是否安排司机"> </el-col>
<el-option </el-row>
v-for="dict in dict.type.arrange_drivers" <el-row>
:key="dict.value" <el-col :span="12">
:label="dict.label" <el-form-item label="解除时间" prop="jcTime">
:value="dict.value" <el-date-picker clearable
></el-option> v-model="form.jcTime"
</el-select> type="datetime"
</el-form-item> style="width: 90%"
<el-form-item label="备注街道" prop="bzStreet"> value-format="yyyy-MM-dd HH:mm:ss"
<el-input v-model="form.bzStreet" placeholder="请输入备注街道" /> placeholder="请选择解除时间">
</el-form-item> </el-date-picker>
<el-form-item label="备注住址" prop="bzAddress"> </el-form-item>
<el-input v-model="form.bzAddress" placeholder="请输入备注住址" /> </el-col>
</el-form-item> <el-col :span="12">
<el-form-item label="删除标志" prop="delFlag"> <el-form-item label="人员类别" prop="rylb">
<el-input v-model="form.delFlag" placeholder="请输入删除标志" /> <el-input style="width: 90%" v-model="form.rylb" placeholder="请输入人员类别"/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> </el-col>
<el-input v-model="form.remark" placeholder="请输入备注" /> </el-row>
</el-form-item> <el-row>
<el-col :span="12">
<el-form-item label="身份证号码" prop="cardNo">
<el-input style="width: 90%" v-model="form.cardNo" placeholder="请输入身份证号码"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="联系方式" prop="phone">
<el-input style="width: 90%" v-model="form.phone" placeholder="请输入联系方式"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="所属街道/镇" prop="street">
<el-select style="width: 90%" v-model="form.street" placeholder="请选择所属街道/镇">
<el-option
v-for="dict in dict.type.street_town"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="所属居委会" prop="committee">
<el-select style="width: 90%" v-model="form.committee" placeholder="请选择所属居委会">
<el-option
v-for="dict in dict.type.committee"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="所属小区" prop="community">
<el-select style="width: 90%" v-model="form.community" placeholder="请选择所属小区">
<el-option
v-for="dict in dict.type.community"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="家庭住址" prop="address">
<el-input style="width: 90%" v-model="form.address" placeholder="请输入家庭住址"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="转运状态" prop="arrangeDrivers">
<el-select style="width: 90%" v-model="form.zyStatus" placeholder="请选择转运状态">
<el-option value="0" label="是"></el-option>
<el-option value="1" label="否"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否安排司机" prop="arrangeDrivers">
<el-select style="width: 90%" v-model="form.arrangeDrivers" placeholder="请选择是否安排司机">
<el-option
v-for="dict in dict.type.arrange_drivers"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="备注街道" prop="bzStreet">
<el-input style="width: 90%" v-model="form.bzStreet" placeholder="请输入备注街道"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="备注住址" prop="bzAddress">
<el-input style="width: 90%" v-model="form.bzAddress" placeholder="请输入备注住址"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input style="width: 96%" type="textarea" :rows="3" maxlength="200" show-word-limit v-model="form.remark" placeholder="请输入备注"/>
</el-form-item>
</el-col>
</el-row>
</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>
...@@ -286,11 +397,12 @@ ...@@ -286,11 +397,12 @@
</template> </template>
<script> <script>
import { listJcglry, getJcglry, delJcglry, addJcglry, updateJcglry } from "@/api/system/jcglry"; import { listJcglry, getJcglry, delJcglry, addJcglry, updateJcglry } from '@/api/system/jcglry'
import { getYcsb } from '@/api/system/ycsb'
export default { export default {
name: "Jcglry", name: 'Jcglry',
dicts: ['is_area', 'arrange_drivers'], dicts: ['is_area', 'arrange_drivers','street_town', 'residential_area','committee','community','isolation_point','shelters'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层
...@@ -308,7 +420,7 @@ export default { ...@@ -308,7 +420,7 @@ export default {
// 解除隔离人员表格数据 // 解除隔离人员表格数据
jcglryList: [], jcglryList: [],
// 弹出层标题 // 弹出层标题
title: "", title: '',
// 是否显示弹出层 // 是否显示弹出层
open: false, open: false,
// 查询参数 // 查询参数
...@@ -331,32 +443,34 @@ export default { ...@@ -331,32 +443,34 @@ export default {
arrangeDrivers: null, arrangeDrivers: null,
bzStreet: null, bzStreet: null,
bzAddress: null, bzAddress: null,
status: null, status: null
}, },
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
rules: { rules: {},
} // 隔离位置数组
}; geliList: []
}
}, },
created() { created() {
this.getList(); console.log(this.dict.type.isolation_point)
this.getList()
}, },
methods: { methods: {
/** 查询解除隔离人员列表 */ /** 查询解除隔离人员列表 */
getList() { getList() {
this.loading = true; this.loading = true
listJcglry(this.queryParams).then(response => { listJcglry(this.queryParams).then(response => {
this.jcglryList = response.rows; this.jcglryList = response.rows
this.total = response.total; this.total = response.total
this.loading = false; this.loading = false
}); })
}, },
// 取消按钮 // 取消按钮
cancel() { cancel() {
this.open = false; this.open = false
this.reset(); this.reset()
}, },
// 表单重置 // 表单重置
reset() { reset() {
...@@ -378,77 +492,96 @@ export default { ...@@ -378,77 +492,96 @@ export default {
arrangeDrivers: null, arrangeDrivers: null,
bzStreet: null, bzStreet: null,
bzAddress: null, bzAddress: null,
status: "0", status: '0',
delFlag: null, delFlag: null,
createBy: null, createBy: null,
createTime: null, createTime: null,
updateBy: null, updateBy: null,
updateTime: null, updateTime: null,
remark: null remark: null
}; }
this.resetForm("form"); this.resetForm('form')
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.pageNum = 1
this.getList(); this.getList()
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm('queryForm')
this.handleQuery(); this.handleQuery()
}, },
// 多选框选中数据 // 多选框选中数据
handleSelectionChange(selection) { handleSelectionChange(selection) {
this.ids = selection.map(item => item.id) this.ids = selection.map(item => item.id)
this.single = selection.length!==1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
/** 新增按钮操作 */ /** 新增按钮操作 */
handleAdd() { handleAdd() {
this.reset()
this.open = true
this.title = '添加解除隔离人员'
},
/** 查看按钮操作 */
handleDetails(row) {
this.formLoading = true
this.reset(); this.reset();
this.title = "查看解除隔离人员";
this.open = true; this.open = true;
this.title = "添加解除隔离人员"; const id = row.id || this.ids
getYcsb(id).then(response => {
this.quSelect()
if (response.data.area === '1'){
this.quSelect(response.data.area)
this.zhenSelect(response.data.street)
this.juSelect(response.data.committee)
}
this.form = response.data;
this.formLoading = false
});
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset()
const id = row.id || this.ids const id = row.id || this.ids
getJcglry(id).then(response => { getJcglry(id).then(response => {
this.form = response.data; this.form = response.data
this.open = true; this.open = true
this.title = "修改解除隔离人员"; this.title = '修改解除隔离人员'
}); })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
updateJcglry(this.form).then(response => { updateJcglry(this.form).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess('修改成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} else { } else {
addJcglry(this.form).then(response => { addJcglry(this.form).then(response => {
this.$modal.msgSuccess("新增成功"); this.$modal.msgSuccess('新增成功')
this.open = false; this.open = false
this.getList(); this.getList()
}); })
} }
} }
}); })
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const ids = row.id || this.ids; const ids = row.id || this.ids
this.$modal.confirm('是否确认删除解除隔离人员编号为"' + ids + '"的数据项？').then(function() { this.$modal.confirm('是否确认删除解除隔离人员编号为"' + ids + '"的数据项？').then(function() {
return delJcglry(ids); return delJcglry(ids)
}).then(() => { }).then(() => {
this.getList(); this.getList()
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess('删除成功')
}).catch(() => {}); }).catch(() => {
})
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
...@@ -457,5 +590,6 @@ export default { ...@@ -457,5 +590,6 @@ export default {
}, `jcglry_${new Date().getTime()}.xlsx`) }, `jcglry_${new Date().getTime()}.xlsx`)
} }
} }
}; }
</script> </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