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

Merge remote-tracking branch 'origin/main'

Browse Source
main
hansha 2 years ago
parent 81045e071a db88a2f50d
commit 49932bfc27
1 changed files with 190 additions and 68 deletions
Show Stats Download Patch File Download Diff File

258
ruoyi-ui/src/views/szxc/dymanage/index.vue
Unescape View File

@ -1,18 +1,14 @@
<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="jmId">
<el-input
v-model="queryParams.jmId"
placeholder="请输入居民id"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
<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="name">
<el-form-item label="居民姓名" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入姓名"
placeholder="请输入居民姓名"
clearable
@keyup.enter.native="handleQuery"
/>
@ -33,22 +29,6 @@
@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="deptId">
<el-input
v-model="queryParams.deptId"
placeholder="请输入部门id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="籍贯" prop="jg">
<el-input
v-model="queryParams.jg"
@ -73,6 +53,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_dy_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="职务" prop="post">
<el-input
v-model="queryParams.post"
@ -81,14 +76,6 @@
@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>
@ -141,26 +128,27 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="dymanageList" @selection-change="handleSelectionChange">
<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="jmId" />
<el-table-column label="姓名" align="center" prop="name" />
<el-table v-loading="loading" :data="dymanageList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="45" align="center" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="居民姓名" align="center" prop="name" />
<el-table-column label="身份证号" align="center" prop="cardId" />
<el-table-column label="手机号" align="center" prop="phone" />
<el-table-column label="所属网格" align="center" prop="deptName" />
<el-table-column label="部门id" align="center" prop="deptId" />
<el-table-column label="籍贯" align="center" prop="jg" />
<el-table-column label="入党时间" align="center" prop="joinDate" width="180">
<el-table-column label="入党时间" align="center" prop="joinDate">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.joinDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="入党单位" align="center" prop="joinUnit" />
<el-table-column label="职务" align="center" prop="post" />
<el-table-column label="分类" align="center" prop="type" />
<el-table-column label="党员分类" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :options="dict.type.szxc_dy_type" :value="scope.row.type"/>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建者ID" align="center" prop="userId" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@ -192,29 +180,30 @@
<!-- 添加或修改党员管理对话框 -->
<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="jmId">
<el-input v-model="form.jmId" placeholder="请输入居民id" />
</el-form-item>
<el-form-item label="姓名" prop="name">
<el-input v-model="form.name" placeholder="请输入姓名" />
<el-form-item label="居民姓名" prop="name">
<el-input readonly v-if="!form.id"
placeholder="请选择居民姓名"
v-model="form.name">
<el-button slot="append" icon="el-icon-search" @click="ownerSelect"></el-button>
</el-input>
<el-input v-if="form.id" v-model="form.name" disabled placeholder="请输入居民姓名" />
</el-form-item>
<el-form-item label="身份证号" prop="cardId">
<el-input v-model="form.cardId" placeholder="请输入身份证号" />
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
<el-input v-model="form.cardId" placeholder="请输入身份证号" :disabled="form.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="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门id" />
<el-input v-model="form.deptName" placeholder="请输入所属网格" :disabled="form.id"/>
</el-form-item>
<el-form-item label="籍贯" prop="jg">
<el-input v-model="form.jg" placeholder="请输入籍贯" />
<el-input v-model="form.jg" placeholder="请输入籍贯" :disabled="form.id"/>
</el-form-item>
<el-form-item label="手机号" prop="phone">
<el-input v-model="form.phone" placeholder="请输入手机号" />
</el-form-item>
<el-form-item label="入党时间" prop="joinDate">
<el-date-picker clearable
<el-date-picker clearable style="width:100%"
v-model="form.joinDate"
type="date"
value-format="yyyy-MM-dd"
@ -224,14 +213,26 @@
<el-form-item label="入党单位" prop="joinUnit">
<el-input v-model="form.joinUnit" placeholder="请输入入党单位" />
</el-form-item>
<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_dy_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="职务" prop="post">
<el-input v-model="form.post" placeholder="请输入职务" />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
</el-form-item>
<el-form-item label="创建者ID" prop="userId">
<el-input v-model="form.userId" placeholder="请输入创建者ID" />
<el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -239,14 +240,66 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog title="选择居民" :visible.sync="jmin.visible" 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 { listDymanage, getDymanage, delDymanage, addDymanage, updateDymanage } from "@/api/szxc/dymanage";
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: "Dymanage",
dicts: ['szxc_yes_no', 'sys_user_sex', 'szxc_dy_type'],
components: { Treeselect },
data() {
return {
// 遮罩层
@ -265,6 +318,8 @@ export default {
dymanageList: [],
// 弹出层标题
title: "",
// 组织树选项
deptOptions: undefined,
// 是否显示弹出层
open: false,
// 查询参数
@ -288,16 +343,53 @@ export default {
form: {},
// 表单校验
rules: {
deptId: [
{ required: true, message: "部门id不能为空", trigger: "blur" }
name: [
{ required: true, message: "居民姓名不能为空", trigger: "blur" }
],
cardId: [
{ required: true, message: "身份证号不能为空", trigger: "blur" }
],
deptName: [
{ required: true, message: "所属网格不能为空", trigger: "blur" }
],
jg: [
{ required: true, message: "籍贯不能为空", trigger: "blur" }
],
}
joinDate: [
{ required: true, message: "入党时间不能为空", trigger: "blur" }
]
},
// 居民信息
jmin: {
visible: 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;
});
},
/** 查询党员管理列表 */
getList() {
this.loading = true;
@ -356,7 +448,7 @@ export default {
handleAdd() {
this.reset();
this.open = true;
this.title = "添加党员管理";
this.title = "添加党员";
},
/** 修改按钮操作 */
handleUpdate(row) {
@ -365,7 +457,7 @@ export default {
getDymanage(id).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改党员管理";
this.title = "修改党员";
});
},
/** 提交按钮 */
@ -403,7 +495,37 @@ export default {
this.download('szxc/dymanage/export', {
...this.queryParams
}, `dymanage_${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.visible = true;
this.getlistJminfo()
},
// 居民查询
jminQuery(){
this.jmin.queryParams.pageNum = 1;
this.getlistJminfo();
},
// 居民选择 选中数据
jminDblclick(row) {
this.form.jmId = row.id;
this.form.name = row.name;
this.form.deptId = row.deptId;
this.form.deptName = row.deptName;
this.form.phone = row.phone;
this.form.cardId = row.cardId;
this.form.jg = row.jg;
this.jmin.visible = false
},
}
};
</script>

Write Preview
Loading…
Cancel
Save