Commit d901ce48 authored by 秦嘉's avatar 秦嘉

解除隔离人员

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