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

车辆管理

Browse Source
main
wanglei 2 years ago
parent ffa39a1168
commit 5f19642a4a
2 changed files with 187 additions and 80 deletions
Show Stats Download Patch File Download Diff File

213
ruoyi-ui/src/views/szxc/carinfo/index.vue
Unescape View File

@ -1,14 +1,6 @@
<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="车主id" prop="ownerId">
<el-input
v-model="queryParams.ownerId"
placeholder="请输入车主id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="70px">
<el-form-item label="车主姓名" prop="ownerName">
<el-input
v-model="queryParams.ownerName"
@ -17,6 +9,10 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所属网格" prop="deptName">
<treeselect v-model="queryParams.deptId" :options="deptOptions" :disable-branch-nodes="true" style="width:215px;"
placeholder="请选择所属网格"/>
</el-form-item>
<el-form-item label="联系方式" prop="phone">
<el-input
v-model="queryParams.phone"
@ -49,38 +45,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="车辆照片" prop="carPicture">
<el-input
v-model="queryParams.carPicture"
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"
/>
</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>
@ -133,14 +98,18 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="carinfoList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="carinfoList" @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="车主id" align="center" prop="ownerId" />
<el-table-column label="车主姓名" align="center" prop="ownerName" />
<el-table-column label="联系方式" align="center" prop="phone" />
<el-table-column label="车牌号" align="center" prop="carNo" />
<el-table-column label="车类型" align="center" prop="carType" />
<el-table-column label="车类型" align="center" prop="carType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_cartype" :value="scope.row.carType"/>
</template>
</el-table-column>
<el-table-column label="颜色" align="center" prop="colour" />
<el-table-column label="品牌" align="center" prop="carBand" />
<el-table-column label="车辆照片" align="center" prop="carPicture" />
@ -179,11 +148,22 @@
<!-- 添加或修改车辆信息对话框 -->
<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="ownerId">
<!-- <el-form-item label="车主id" prop="ownerId">
<el-input v-model="form.ownerId" placeholder="请输入车主id" />
</el-form-item>-->
<el-form-item label="车主姓名" prop="ownerName" v-if="!form.id">
<el-input readonly
placeholder="请选择车主姓名"
v-model="form.ownerName">
<el-button slot="append" icon="el-icon-search" @click="ownerSelect"></el-button>
</el-input>
</el-form-item>
<el-form-item label="车主姓名" prop="ownerName">
<el-input v-model="form.ownerName" placeholder="请输入车主姓名" />
<!-- <el-form-item label="部门id" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id" />
</el-form-item>-->
<el-form-item label="所属网格" prop="deptId">
<treeselect v-model="form.deptId" :options="deptOptions" :disable-branch-nodes="true"
disabled placeholder="请选择所属网格" style="width:100%;" @select="selectedTree"/>
</el-form-item>
<el-form-item label="联系方式" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系方式" />
@ -191,6 +171,21 @@
<el-form-item label="车牌号" prop="carNo">
<el-input v-model="form.carNo" placeholder="请输入车牌号" />
</el-form-item>
<el-form-item label="车类型" prop="carType">
<el-select :disabled="form.id"
v-model="form.carType"
placeholder="车类型"
clearable
style="width:100%"
>
<el-option
v-for="dict in dict.type.szxc_cartype"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="颜色" prop="colour">
<el-input v-model="form.colour" placeholder="请输入颜色" />
</el-form-item>
@ -200,15 +195,6 @@
<el-form-item label="车辆照片" prop="carPicture">
<el-input v-model="form.carPicture" placeholder="请输入车辆照片" />
</el-form-item>
<el-form-item label="部门id" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id" />
</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-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
@ -218,14 +204,66 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog title="选择居民" :visible.sync="jmin.dialogVisible" width="1000px" append-to-body>
<el-form :model="jmin.queryParams" ref="queryForm" size="small" :inline="true" label-width="70px">
<el-form-item label="身份证号" prop="cardId">
<el-input
v-model="jmin.queryParams.cardId"
placeholder="请输入身份证号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="姓名" prop="name">
<el-input
v-model="jmin.queryParams.name"
placeholder="请输入姓名"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="jminQuery">搜索</el-button>
</el-form-item>
</el-form>
<el-alert title="双击选择户主" type="warning" :closable="false"></el-alert>
<el-table v-loading="jmin.loading" :data="jmin.list" border @cell-dblclick="jminDblclick">
<el-table-column label="姓名" align="center" prop="name" min-width="80"/>
<el-table-column label="身份证号" align="center" prop="cardId" min-width="180"/>
<el-table-column label="所属网格" align="center" prop="deptName" min-width="100"/>
<el-table-column label="性别" align="center" prop="sex">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
</template>
</el-table-column>
<el-table-column label="籍贯" align="center" prop="jg" min-width="180"/>
<el-table-column label="手机号" align="center" prop="phone" min-width="120"/>
<el-table-column label="现居住地" align="center" prop="currentAddress" min-width="180"/>
</el-table>
<pagination
v-show="jmin.total>0"
:total="jmin.total"
:page.sync="jmin.queryParams.pageNum"
:limit.sync="jmin.queryParams.pageSize"
@pagination="getlistJminfo"
/>
</el-dialog>
</div>
</template>
<script>
import { listCarinfo, getCarinfo, delCarinfo, addCarinfo, updateCarinfo } from "@/api/szxc/carinfo";
import { listJminfo } from "@/api/szxc/jminfo";
import { deptTreeSelect } from "@/api/system/user";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
name: "Carinfo",
components: { Treeselect },
dicts: ['szxc_cartype'],
data() {
return {
// 遮罩层
@ -242,6 +280,8 @@ export default {
total: 0,
// 车辆信息表格数据
carinfoList: [],
// 组织树选项
deptOptions: undefined,
// 弹出层标题
title: "",
// 是否显示弹出层
@ -279,15 +319,44 @@ export default {
{ required: true, message: "颜色不能为空", trigger: "blur" }
],
deptId: [
{ required: true, message: "部门id不能为空", trigger: "blur" }
{ required: true, message: "所属网格不能为空", trigger: "blur" }
],
}
},
// 居民信息
jmin: {
dialogVisible: false,
// 遮罩层
loading: false,
// 总条数
total: 0,
// 查询参数
queryParams:{
pageNum: 1,
pageSize: 10,
off: '0',
cardId: '',
name: ''
},
// 查询列表
list: []
},
};
},
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;
@ -361,6 +430,7 @@ export default {
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.carType='1'
if (this.form.id != null) {
updateCarinfo(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
@ -392,7 +462,34 @@ export default {
this.download('szxc/carinfo/export', {
...this.queryParams
}, `carinfo_${new Date().getTime()}.xlsx`)
}
},
/** 查询居民信息列表 */
getlistJminfo() {
this.jmin.loading = true;
listJminfo(this.jmin.queryParams).then(response => {
this.jmin.list = response.rows;
this.jmin.total = response.total;
this.jmin.loading = false;
});
},
// 点击选择居民
ownerSelect(){
this.jmin.dialogVisible = true;
this.getlistJminfo()
},
// 居民查询
jminQuery(){
this.jmin.queryParams.pageNum = 1;
this.getlistJminfo();
},
// 居民选择 选中数据
jminDblclick(row) {
this.form.ownerId = row.id;
this.form.ownerName = row.name;
this.form.deptId = row.deptId;
this.form.deptName = row.deptName;
this.jmin.dialogVisible = false
},
}
};
</script>

52
ruoyi-ui/src/views/szxc/jminfo/index.vue
Unescape View File

@ -303,9 +303,9 @@
<el-table-column type="selection" width="45" align="center" fixed/>
<el-table-column label="居民ID" align="center" prop="id" fixed/>
<el-table-column label="人员基本信息" align="center">
<el-table-column label="姓名" align="center" prop="name" min-width="80"/>
<el-table-column label="曾用名" align="center" prop="oldName" min-width="80"/>
<el-table-column label="国籍" align="center" prop="nationality" min-width="80">
<el-table-column label="姓名" align="center" prop="name" min-width="100"/>
<el-table-column label="曾用名" align="center" prop="oldName" min-width="100"/>
<el-table-column label="国籍" align="center" prop="nationality" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_gj" :value="scope.row.nationality"/>
</template>
@ -321,12 +321,12 @@
<dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex"/>
</template>
</el-table-column>
<el-table-column label="籍贯" align="center" prop="jg" min-width="100"/>
<el-table-column label="籍贯" align="center" prop="jg" min-width="180" show-overflow-tooltip/>
</el-table-column>
<el-table-column label="户信息" align="center">
<el-table-column label="户号" align="center" prop="acountNo" min-width="100"/>
<el-table-column label="所属网格" align="center" prop="deptName" min-width="100"/>
<el-table-column label="户籍地址" align="center" prop="hjAddress" min-width="100"/>
<el-table-column label="户号" align="center" prop="acountNo" min-width="120"/>
<el-table-column label="所属网格" align="center" prop="deptName" min-width="120"/>
<el-table-column label="户籍地址" align="center" prop="hjAddress" min-width="120" show-overflow-tooltip/>
</el-table-column>
<el-table-column label="户籍性质信息" align="center">
<el-table-column label="户籍性质" align="center" prop="jgNature" min-width="100">
@ -370,7 +370,7 @@
<dict-tag :options="dict.type.szxc_zjxy" :value="scope.row.zjxy"/>
</template>
</el-table-column>
<el-table-column label="健康状况" align="center" prop="jkzk" >
<el-table-column label="健康状况" align="center" prop="jkzk" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_jkzk" :value="scope.row.jkzk"/>
</template>
@ -387,14 +387,14 @@
<dict-tag :options="dict.type.szxc_off" :value="scope.row.off"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="160">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="180">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
@click="handleUpdate(scope.row)"
v-hasPermi="['szxc:jminfo:edit']"
>信息更新</el-button>
>修改</el-button>
<el-button
size="mini"
type="text"
@ -402,16 +402,13 @@
@click="handleZx(scope.row)"
v-hasPermi="['szxc:jminfo:remove']"
>注销</el-button>
<el-button
size="mini"
type="text"
@click="handleJmtag(scope.row)"
>人员标签</el-button>
<el-button
size="mini"
type="text"
@click="handleBankInfo(scope.row)"
>银行卡信息</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" style="margin-left: 6px">
<el-button size="mini" type="text">更多操作</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleJmtag" >人员标签</el-dropdown-item>
<el-dropdown-item command="handleBankInfo" >银行卡信息</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column>
</el-table>
@ -857,7 +854,7 @@
</template>
<script>
import { listJminfo, getJminfo, delJminfo, addJminfo, updateJminfo } from "@/api/szxc/jminfo";
import { listJminfo, getJminfo, addJminfo, updateJminfo } from "@/api/szxc/jminfo";
import { listAddress } from "@/api/szxc/address";
import { listJmtag, addAllJmtag } from "@/api/szxc/jmtag";
import { listTag } from "@/api/szxc/tag";
@ -1226,6 +1223,19 @@ export default {
...this.queryParams
}, `jminfo_${new Date().getTime()}.xlsx`)
},
// 更多操作触发
handleCommand(command, row) {
switch (command) {
case "handleJmtag":
this.handleJmtag(row);
break;
case "handleBankInfo":
this.handleBankInfo(row);
break;
default:
break;
}
},
/** 查询户主信息列表 */
getlistAddress() {
this.hzInfo.loading = true;

Write Preview
Loading…
Cancel
Save