Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build
This commit is contained in:
yanran200730
@@ -0,0 +1,57 @@
|
||||
<template>
|
||||
<section class="AppGeneralElection">
|
||||
<keep-alive :include="['electionList']">
|
||||
<component ref="component" :is="component" :instance="instance" :params="params" :dict="dict" @change="onChange"/>
|
||||
</keep-alive>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import electionList from "./components/electionList.vue";
|
||||
import electionAdd from "./components/electionAdd.vue";
|
||||
|
||||
export default {
|
||||
name: "AppGeneralElection",
|
||||
label: "换届选举",
|
||||
props: {
|
||||
instance: Function,
|
||||
dict: Object,
|
||||
},
|
||||
components: {electionAdd, electionList},
|
||||
data() {
|
||||
return {
|
||||
component: "electionList",
|
||||
params: {},
|
||||
include: [],
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
onChange(data) {
|
||||
if (data.type === "electionAdd") {
|
||||
this.component = "electionAdd";
|
||||
this.params = data.params;
|
||||
}
|
||||
|
||||
if (data.type === "electionList") {
|
||||
this.component = "electionList";
|
||||
this.params = data.params;
|
||||
|
||||
this.$nextTick(() => {
|
||||
if (data.isRefresh) {
|
||||
this.$refs.component.getList();
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
},
|
||||
created() {
|
||||
// this.dict.load("portalUserStatus", "enterpriseStatus", "userEnterpriseStatus","enterpriseType")
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.AppGeneralElection {
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,140 @@
|
||||
<template>
|
||||
<section class="electionAdd">
|
||||
<ai-detail>
|
||||
<ai-title slot="title" title="添加换届选举" isShowBottomBorder isShowBack @onBackClick="cancel(true)"/>
|
||||
<template slot="content">
|
||||
<ai-card title="基本信息">
|
||||
<template #content>
|
||||
<div class="add-form">
|
||||
<el-form ref="form" :model="form" :rules="formRules" size="small" label-width="150px">
|
||||
|
||||
<el-form-item label="标题" prop="licenseName">
|
||||
<el-input v-model="form.licenseName" placeholder="请输入" show-word-limit maxlength="100"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="投票说明" prop="licenseName">
|
||||
<el-input type="textarea" :rows="5" v-model="form.licenseName" placeholder="请输入" show-word-limit maxlength="500"></el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="单位名称" prop="licenseOrganization">
|
||||
<el-input size="small" disabled placeholder="请选择所属党组织" v-model="form.partyOrgName">
|
||||
<template slot="append">
|
||||
<ai-party :instance="instance" size="small" :value="form.partyOrgId" @origin="handlePartyOrgSelect"/>
|
||||
</template>
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="选举方式" prop="licenseOrganization">
|
||||
<el-radio v-model="form.radio" label="1">等额</el-radio>
|
||||
<el-radio v-model="form.radio" label="2">差额</el-radio>
|
||||
</el-form-item>
|
||||
|
||||
<el-row type="flex">
|
||||
<el-col :span="20">
|
||||
<el-form-item label="应选人数" prop="licenseCode">
|
||||
<el-input type="number" v-model="form.licenseCode" placeholder="请输入"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="20">
|
||||
<el-form-item label="投票日期" prop="decisionDate">
|
||||
<el-date-picker v-model="form.decisionDate" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width:338px">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-form-item label="候选人" prop="licenseOrganization">
|
||||
<ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
|
||||
url="/app/appgirdmemberinfo/list" headerTitle="党员列表"
|
||||
:isMultiple="true" dialogTitle="选择" @selectPerson="selectPerson" class="aipersonselect">
|
||||
<template name="option" v-slot:option="{ item }">
|
||||
<span class="iconfont iconProlife">{{ item.name }}</span>
|
||||
<!-- <ai-id mode="show" :show-eyes="false" :value="item.idNumber"/> -->
|
||||
<span>{{ item.phone }}</span>
|
||||
</template>
|
||||
</ai-person-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="投票人" prop="licenseOrganization">
|
||||
<ai-person-select :instance="instance" :customClicker="true" :chooseUserList="chooseUserList"
|
||||
url="/app/appgirdmemberinfo/list" headerTitle="党员列表"
|
||||
dialogTitle="选择" @selectPerson="selectPerson" class="aipersonselect">
|
||||
<template name="option" v-slot:option="{ item }">
|
||||
<span class="iconfont iconProlife">{{ item.name }}</span>
|
||||
<ai-id mode="show" :show-eyes="false" :value="item.idNumber"/>
|
||||
</template>
|
||||
</ai-person-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</template>
|
||||
</ai-card>
|
||||
</template>
|
||||
<template slot="footer" class="footer">
|
||||
<el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
|
||||
<el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
|
||||
</template>
|
||||
</ai-detail>
|
||||
<!-- <ai-detail class="add" v-if="id && !isEdit">
|
||||
<template slot="title">
|
||||
<ai-title title="行政许可信息详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
|
||||
</template>
|
||||
<template slot="content">
|
||||
<ai-card title="基本信息">
|
||||
<template #right>
|
||||
<span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="edit">修改</span>
|
||||
</template>
|
||||
<template #content v-if="isEdit == false">
|
||||
<ai-wrapper>
|
||||
<ai-info-item label="许可文书名称" :value="data.licenseName"></ai-info-item>
|
||||
<ai-info-item label="许可文书号" :value="data.licenseCode"></ai-info-item>
|
||||
<ai-info-item label="许可决定日期" :value="data.decisionDate"></ai-info-item>
|
||||
<ai-info-item label="许可有效期自" :value="data.startDate"></ai-info-item>
|
||||
<ai-info-item label="许可有效期至" :value="data.endDate"></ai-info-item>
|
||||
<ai-info-item label="许可机关" isLine :value="data.licenseOrganization"></ai-info-item>
|
||||
<ai-info-item label="经营主体" isLine :value="data.enterpriseName"></ai-info-item>
|
||||
<ai-info-item label="统一信用代码" isLine :value="data.unifiedCode"></ai-info-item>
|
||||
<ai-info-item label="许可内容" isLine :value="data.licenseContent"></ai-info-item>
|
||||
</ai-wrapper>
|
||||
</template>
|
||||
</ai-card>
|
||||
</template>
|
||||
</ai-detail> -->
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: "electionAdd",
|
||||
props: {
|
||||
instance: Function,
|
||||
dict: Object,
|
||||
permissions: Function
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
form: {
|
||||
|
||||
},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
cancel (isRefresh) {
|
||||
this.$emit('change', {
|
||||
type: 'electionList',
|
||||
isRefresh: !!isRefresh
|
||||
})
|
||||
}
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scope>
|
||||
.electionAdd {
|
||||
height: 100%;
|
||||
|
||||
::v-deep .el-date-editor .el-input {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,87 @@
|
||||
<template>
|
||||
<section class="electionList">
|
||||
<ai-list>
|
||||
<ai-title slot="title" title="换届选举" isShowBottomBorder />
|
||||
<template #content>
|
||||
<ai-search-bar>
|
||||
<template #left>
|
||||
<el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')" >添加</el-button>
|
||||
<ai-select v-model="search.status" @change=";(page.current = 1), getList()" placeholder="请选择状态" :selectList="dict.getDict('cwpStatus')"></ai-select>
|
||||
</template>
|
||||
<template #right>
|
||||
<el-input v-model="search.groupName" class="search-input" size="small" v-throttle="() => { ;(page.current = 1), getList() } " placeholder="标题" clearable @change="getList" @clear="page.current = 1, (search.title = ''), getList()" suffix-icon="iconfont iconSearch">
|
||||
</el-input>
|
||||
<el-button size="small" type="primary" icon="el-icon-refresh-right" @click="reset" >重置</el-button>
|
||||
</template>
|
||||
</ai-search-bar>
|
||||
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size" @getList="getList" :col-configs="colConfigs" :dict="dict">
|
||||
<el-table-column slot="options" label="操作" fixed="right" align="center">
|
||||
<template slot-scope="{ row }">
|
||||
<!-- show-overflow-tooltip -->
|
||||
<el-button type="text" @click.native="toAdd(row.id)">编辑</el-button>
|
||||
<el-button type="text" @click.native="toAdd(row.id)">详情</el-button>
|
||||
<el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</ai-table>
|
||||
</template>
|
||||
</ai-list>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
export default {
|
||||
name: 'electionList',
|
||||
props: {
|
||||
instance: Function,
|
||||
dict: Object
|
||||
},
|
||||
data () {
|
||||
return {
|
||||
search: {
|
||||
status: '',
|
||||
title: '',
|
||||
tableData: [],
|
||||
},
|
||||
page: {
|
||||
current: 1,
|
||||
size: 10,
|
||||
total: '',
|
||||
},
|
||||
}
|
||||
},
|
||||
created () {
|
||||
this.dict.load('yesOrNo', 'partyFourLinkageStatus')
|
||||
},
|
||||
computed: {
|
||||
colConfigs() {
|
||||
return [
|
||||
{prop: "", label: "标题", align: "left"},
|
||||
{prop: "", label: "所属支部", align: "center"},
|
||||
{prop: "", label: "选举方式", align: "center"},
|
||||
{prop: "", label: "应选人数", align: "center"},
|
||||
{prop: "", label: "状态", align: "center",width: "180px"},
|
||||
{ slot: "options", },
|
||||
]
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
getList () {},
|
||||
toAdd(id) {
|
||||
this.$emit('change', {
|
||||
type: 'electionAdd',
|
||||
params: {
|
||||
id: id || '',
|
||||
}
|
||||
})
|
||||
},
|
||||
reset() {},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.electionList {
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,58 @@
|
||||
<template>
|
||||
<div class="AppRecruitPartyMembers">
|
||||
<component ref="component" :is="currentPage" :selected.sync="selected" v-bind="$props"/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import List from './components/List'
|
||||
import Add from './components/Add'
|
||||
import Detail from './components/Detail'
|
||||
import {mapState} from "vuex";
|
||||
import NeighbourSetting from "./components/neighbourSetting";
|
||||
|
||||
export default {
|
||||
name: 'AppRecruitPartyMembers',
|
||||
label: '发展党员',
|
||||
components: {
|
||||
NeighbourSetting,
|
||||
Add,
|
||||
List,
|
||||
Detail
|
||||
},
|
||||
props: {
|
||||
instance: Function,
|
||||
dict: Object,
|
||||
permissions:Function
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
selected: {}
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapState(['user']),
|
||||
currentPage() {
|
||||
if (this.$route.hash == "#add") {
|
||||
return Add
|
||||
} else if (this.$route.hash == "#ns") {
|
||||
return NeighbourSetting
|
||||
} else if (this.$route.query.id) {
|
||||
return Detail
|
||||
} else return List
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.dict.load("yesOrNo")
|
||||
let {organizationId: id, organizationName: name} = this.user.info
|
||||
this.selected = {id, name}
|
||||
},
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.AppRecruitPartyMembers {
|
||||
height: 100%;
|
||||
}
|
||||
</style>
|
||||
1089
project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
Normal file
1089
project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
Normal file
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,372 @@
|
||||
<template>
|
||||
<ai-detail class="party-detail">
|
||||
<template slot="title">
|
||||
<ai-title
|
||||
title="党员信息详情"
|
||||
isShowBack
|
||||
isShowBottomBorder
|
||||
@onBackClick="cancel(true)"
|
||||
></ai-title>
|
||||
</template>
|
||||
<template slot="content">
|
||||
<div>
|
||||
<ai-card title="基本信息">
|
||||
<template #content>
|
||||
<ai-wrapper label-width="72px">
|
||||
<ai-avatar
|
||||
class="party-avatar"
|
||||
v-model="info.avatarUrl"
|
||||
:editable="false"
|
||||
></ai-avatar>
|
||||
<ai-info-item label="姓名">{{ info.name }}</ai-info-item>
|
||||
<ai-info-item
|
||||
label="性别"
|
||||
:value="dict.getLabel('sex', info.sex)"
|
||||
></ai-info-item>
|
||||
<ai-info-item label="身份证号">
|
||||
<ai-id mode="show" :value="info.idNumber" rightBtn />
|
||||
</ai-info-item>
|
||||
<ai-info-item
|
||||
label="民族"
|
||||
:value="dict.getLabel('nation', info.nation)"
|
||||
></ai-info-item>
|
||||
<ai-info-item
|
||||
label="出生日期"
|
||||
:value="info.birthday"
|
||||
></ai-info-item>
|
||||
<ai-info-item label="年龄">{{ info.age }}</ai-info-item>
|
||||
<ai-info-item label="发展状态">{{ info.age }}</ai-info-item>
|
||||
<ai-info-item
|
||||
label="籍贯"
|
||||
isLine
|
||||
:value="info.birthplaceAreaName"
|
||||
></ai-info-item>
|
||||
<ai-info-item
|
||||
label="户籍地"
|
||||
isLine
|
||||
:value="info.householdAreaName"
|
||||
></ai-info-item>
|
||||
</ai-wrapper>
|
||||
</template>
|
||||
</ai-card>
|
||||
<ai-card title="联络信息">
|
||||
<template #content>
|
||||
<ai-wrapper label-width="72px">
|
||||
<ai-info-item label="联系方式">{{ info.name }}</ai-info-item>
|
||||
<ai-info-item
|
||||
label="现住址"
|
||||
isLine
|
||||
:value="info.householdAreaName"
|
||||
></ai-info-item>
|
||||
</ai-wrapper>
|
||||
</template>
|
||||
</ai-card>
|
||||
<ai-card title="团籍信息">
|
||||
<template #content>
|
||||
<ai-wrapper label-width="72px">
|
||||
<ai-info-item label="入团日期">{{ info.name }}</ai-info-item>
|
||||
<ai-info-item label="文化程度">{{ info.name }}</ai-info-item>
|
||||
<ai-info-item label="学位职称">{{ info.name }}</ai-info-item>
|
||||
<ai-info-item label="奖励情况" isLine :value="info.householdAreaName"></ai-info-item>
|
||||
<ai-info-item label="处分情况" isLine :value="info.householdAreaName"></ai-info-item>
|
||||
<ai-info-item label="简历" isLine :value="info.householdAreaName"></ai-info-item>
|
||||
<ai-info-item label="附件" isLine>
|
||||
<ai-file-list v-if="info.files && info.files.length"
|
||||
:fileList="info.files"
|
||||
:fileOps="{ name: 'name', size: 'fileSizeStr' }"
|
||||
></ai-file-list>
|
||||
</ai-info-item>
|
||||
</ai-wrapper>
|
||||
</template>
|
||||
</ai-card>
|
||||
<ai-card title="申请入学">
|
||||
<template #content>
|
||||
<ai-wrapper label-width="72px">
|
||||
<ai-info-item label="申请入学时间">{{ info.name }}</ai-info-item>
|
||||
<ai-info-item
|
||||
label="申请入学形式"
|
||||
isLine
|
||||
:value="info.householdAreaName"
|
||||
></ai-info-item>
|
||||
</ai-wrapper>
|
||||
</template>
|
||||
</ai-card>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
</ai-detail>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { mapState } from "vuex";
|
||||
|
||||
export default {
|
||||
name: "detail",
|
||||
|
||||
props: {
|
||||
instance: Function,
|
||||
dict: Object,
|
||||
params: Object,
|
||||
},
|
||||
|
||||
data() {
|
||||
return {
|
||||
info: {},
|
||||
isShowStarForm: false,
|
||||
isShowJobForm: false,
|
||||
jobForm: {
|
||||
date: [],
|
||||
company: "",
|
||||
position: "",
|
||||
},
|
||||
jobId: "",
|
||||
starForm: {
|
||||
starTime: "",
|
||||
level: 1,
|
||||
},
|
||||
disciplinaryId: "",
|
||||
isShowDisciplinaryForm: false,
|
||||
disciplinaryForm: {
|
||||
starTime: "",
|
||||
disciplinaryInfo: "",
|
||||
result: "",
|
||||
},
|
||||
starId: "",
|
||||
activeName: "五星党员",
|
||||
textlist: ["一星党员", "二星党员", "三星党员", "四星党员", "五星党员"],
|
||||
colConfigs1: [
|
||||
{
|
||||
prop: "starTime",
|
||||
label: "评定时间",
|
||||
align: "center",
|
||||
formart: (v) => (v ? v.split(" ")[0] : "-"),
|
||||
},
|
||||
{ slot: "level" },
|
||||
],
|
||||
colConfigs2: [
|
||||
{ slot: "date" },
|
||||
{ prop: "company", label: "单位", align: "center" },
|
||||
{ prop: "position", label: "职务", align: "center" },
|
||||
],
|
||||
colConfigs3: [
|
||||
{
|
||||
prop: "starTime",
|
||||
label: "时间",
|
||||
align: "center",
|
||||
formart: (v) => (v ? v.split(" ")[0] : "-"),
|
||||
},
|
||||
{ prop: "disciplinaryInfo", label: "违纪原因", align: "center" },
|
||||
{ prop: "result", label: "处理结果", align: "center" },
|
||||
],
|
||||
};
|
||||
},
|
||||
|
||||
computed: {
|
||||
...mapState(["user"]),
|
||||
},
|
||||
|
||||
created() {
|
||||
this.getInfo();
|
||||
},
|
||||
|
||||
methods: {
|
||||
getInfo() {
|
||||
let { id } = this.$route.query;
|
||||
id &&
|
||||
this.instance
|
||||
.post(`/app/appparty/detail`, null, {
|
||||
params: { id },
|
||||
})
|
||||
.then((res) => {
|
||||
if (res?.data) {
|
||||
this.info = res.data;
|
||||
if (this.info.birthday) {
|
||||
this.info.birthday = this.info.birthday.substring(0, 10);
|
||||
}
|
||||
}
|
||||
});
|
||||
},
|
||||
remove(id, apiUrl) {
|
||||
this.$confirm("确定删除该数据？").then(() => {
|
||||
this.instance.post(`${apiUrl}?ids=${id}`).then((res) => {
|
||||
if (res.code == 0) {
|
||||
this.getInfo();
|
||||
this.$message.success("删除成功！");
|
||||
}
|
||||
});
|
||||
});
|
||||
},
|
||||
editJob(query) {
|
||||
this.jobForm = {
|
||||
...query,
|
||||
date: [query.starTime, query.endTime],
|
||||
};
|
||||
this.jobId = query.id;
|
||||
|
||||
this.isShowJobForm = true;
|
||||
},
|
||||
editStar(query) {
|
||||
this.starForm = {
|
||||
...query,
|
||||
};
|
||||
this.starId = query.id;
|
||||
|
||||
this.isShowStarForm = true;
|
||||
},
|
||||
|
||||
editDisciplinary(query) {
|
||||
this.disciplinaryForm = {
|
||||
...query,
|
||||
};
|
||||
this.disciplinaryId = query.id;
|
||||
|
||||
this.isShowDisciplinaryForm = true;
|
||||
},
|
||||
|
||||
onDisciplinarForm() {
|
||||
this.$refs.disciplinaryForm.validate((valid) => {
|
||||
if (valid) {
|
||||
this.instance
|
||||
.post(`/app/apppartydisciplinaryinfo/addOrUpdate`, {
|
||||
...this.disciplinaryForm,
|
||||
partyId: this.params.id,
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.code == 0) {
|
||||
this.isShowDisciplinaryForm = false;
|
||||
this.getInfo();
|
||||
this.$message.success(this.jobId ? "编辑成功" : "新增成功");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
onJobForm() {
|
||||
this.$refs.jobForm.validate((valid) => {
|
||||
if (valid) {
|
||||
this.instance
|
||||
.post(`/app/apppartyworkinfo/addOrUpdate`, {
|
||||
...this.jobForm,
|
||||
starTime: this.jobForm.date[0],
|
||||
endTime: this.jobForm.date[1],
|
||||
partyId: this.params.id,
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.code == 0) {
|
||||
this.isShowJobForm = false;
|
||||
this.getInfo();
|
||||
this.$message.success(this.jobId ? "编辑成功" : "新增成功");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
onStarForm() {
|
||||
this.$refs.starForm.validate((valid) => {
|
||||
if (valid) {
|
||||
this.instance
|
||||
.post(`/app/apppartyfivestar/addOrUpdate`, {
|
||||
...this.starForm,
|
||||
idNumber: this.info.idNumber,
|
||||
partyId: this.params.id,
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.code == 0) {
|
||||
this.isShowStarForm = false;
|
||||
this.getInfo();
|
||||
this.$message.success(this.starId ? "编辑成功" : "新增成功");
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
onClose() {
|
||||
this.starId = "";
|
||||
this.jobId = "";
|
||||
this.disciplinaryId = "";
|
||||
this.starForm.level = 0;
|
||||
this.starForm.id = "";
|
||||
this.starForm.starTime = "";
|
||||
this.jobForm.date = [];
|
||||
this.jobForm.company = "";
|
||||
this.jobForm.id = "";
|
||||
this.jobForm.position = "";
|
||||
this.disciplinaryForm.starTime = "";
|
||||
this.disciplinaryForm.id = "";
|
||||
this.disciplinaryForm.disciplinaryInfo = "";
|
||||
this.disciplinaryForm.result = "";
|
||||
},
|
||||
|
||||
addForm(type) {
|
||||
if (type === "五星党员") {
|
||||
this.isShowStarForm = true;
|
||||
} else if (type === "工作信息") {
|
||||
this.isShowJobForm = true;
|
||||
} else {
|
||||
this.isShowDisciplinaryForm = true;
|
||||
}
|
||||
},
|
||||
|
||||
cancel() {
|
||||
this.$router.push({});
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.party-detail {
|
||||
::v-deep .AiID {
|
||||
line-height: 1.4;
|
||||
color: #222;
|
||||
|
||||
.el-button {
|
||||
height: auto;
|
||||
padding: 0 8px 0 0;
|
||||
}
|
||||
}
|
||||
|
||||
.party-avatar {
|
||||
position: absolute;
|
||||
right: 100px;
|
||||
}
|
||||
}
|
||||
|
||||
.audit-0 {
|
||||
color: #ff8822 !important;
|
||||
}
|
||||
|
||||
.audit-1 {
|
||||
color: #2ea222 !important;
|
||||
}
|
||||
|
||||
.add-btn {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin: 10px 0 20px;
|
||||
|
||||
div {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
color: #2266ff;
|
||||
font-size: 14px;
|
||||
|
||||
&:hover {
|
||||
opacity: 0.6;
|
||||
cursor: pointer;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
i {
|
||||
line-height: 1;
|
||||
margin-right: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,298 @@
|
||||
<template>
|
||||
<ai-list class="partyList">
|
||||
<template slot="title">
|
||||
<ai-title title="发展党员" isShowBottomBorder/>
|
||||
</template>
|
||||
<template #left>
|
||||
<ai-tree-menu title="组织目录" searchPlaceholder="请输入党组织名称" @search="onSearch">
|
||||
<ai-party-tree
|
||||
:filter-node-method="filterNode"
|
||||
ref="tree"
|
||||
:instance="instance"
|
||||
:root="user.info.organizationId"
|
||||
:current-node-key="selected.id"
|
||||
@select="onTreeChange"/>
|
||||
</ai-tree-menu>
|
||||
|
||||
</template>
|
||||
<template slot="content">
|
||||
<ai-search-bar>
|
||||
<template #left>
|
||||
<ai-select v-model="search.sex" placeholder="请选择性别" :selectList="dict.getDict('sex')"
|
||||
@change="search.current = 1, getList()"></ai-select>
|
||||
<ai-search label="年龄">
|
||||
<ai-range v-model="search.age" ref="resetagefoo" @change="search.current = 1, getList()"
|
||||
@closeVal="search.age = []"/>
|
||||
</ai-search>
|
||||
<!-- <ai-select v-model="search.nation" placeholder="请选择民族" :selectList="dict.getDict('nation')"
|
||||
@change="search.current = 1, getList()"></ai-select>
|
||||
<ai-select v-model="search.partyStatus" placeholder="请选择党籍状态" :selectList="dict.getDict('partyStatus')"
|
||||
@change="search.current = 1, getList()"></ai-select>
|
||||
<ai-select v-model="search.flowStatus" placeholder="请选择流动状态" :selectList="dict.getDict('flowStatus')"
|
||||
@change="search.current = 1, getList()"></ai-select>
|
||||
<ai-select v-model="search.education" placeholder="请选择文化程度" :selectList="dict.getDict('education')"
|
||||
@change="search.current = 1, getList()"></ai-select>
|
||||
<ai-select v-model="search.partyPosition" placeholder="请选择党内职务" :selectList="dict.getDict('partyPosition')"
|
||||
@change="search.current = 1, getList()"></ai-select>
|
||||
<ai-select v-model="search.disciplinary" placeholder="请选择违纪情况" :selectList="dict.getDict('disciplinary')"
|
||||
@change="search.current = 1, getList()"></ai-select>
|
||||
<ai-search label="出生日期">
|
||||
<el-date-picker
|
||||
size="small"
|
||||
v-model="search.birthStart"
|
||||
type="date"
|
||||
placeholder="开始日期"
|
||||
format="yyyy-MM-dd"
|
||||
style="width: 180px"
|
||||
@change="search.current = 1, getList()"
|
||||
clearable
|
||||
:value-format="'yyyy-MM-dd'+' 00:00:00'"/>
|
||||
<el-date-picker
|
||||
size="small"
|
||||
v-model="search.birthEnd"
|
||||
type="date"
|
||||
placeholder="结束日期"
|
||||
format="yyyy-MM-dd"
|
||||
style="width: 180px"
|
||||
@change="search.current = 1, getList()"
|
||||
clearable
|
||||
:value-format="'yyyy-MM-dd'+' 23:59:59'"/>
|
||||
</ai-search> -->
|
||||
<ai-search label="入学时间">
|
||||
<el-date-picker
|
||||
size="small"
|
||||
v-model="search.joinPartyStart"
|
||||
type="date"
|
||||
style="width: 180px"
|
||||
placeholder="开始日期"
|
||||
format="yyyy-MM-dd"
|
||||
@change="search.current = 1, getList()"
|
||||
clearable
|
||||
:value-format="'yyyy-MM-dd'+' 00:00:00'">
|
||||
</el-date-picker>
|
||||
<el-date-picker
|
||||
size="small"
|
||||
v-model="search.joinPartyEnd"
|
||||
type="date"
|
||||
style="width: 180px"
|
||||
placeholder="结束日期"
|
||||
format="yyyy-MM-dd"
|
||||
@change="search.current = 1, getList()"
|
||||
clearable
|
||||
:value-format="'yyyy-MM-dd'+' 23:59:59'">
|
||||
</el-date-picker>
|
||||
</ai-search>
|
||||
</template>
|
||||
<template slot="right">
|
||||
<el-input
|
||||
v-model="search.con"
|
||||
size="small"
|
||||
placeholder="请输入姓名或身份证"
|
||||
clearable
|
||||
@change="search.current=1,getList()"
|
||||
suffix-icon="iconfont iconSearch"/>
|
||||
</template>
|
||||
</ai-search-bar>
|
||||
<ai-search-bar>
|
||||
<template #left>
|
||||
<el-button size="small" :disabled="!isShowAddBtn" type="primary" icon="iconfont iconAdd" @click="toAdd()">添加</el-button>
|
||||
<el-button size="small" :disabled="!ids.length" icon="iconfont iconDelete" @click="toAdd()">删除</el-button>
|
||||
</template>
|
||||
<!-- <template #right>
|
||||
<ai-import :instance="instance" :dict="dict" type="appparty" name="发展党员" @success="getList()"></ai-import>
|
||||
<ai-download :instance="instance" :params="exportQuery" url="/app/appparty/export2" fileName="党员明细"/>
|
||||
</template> -->
|
||||
</ai-search-bar>
|
||||
<ai-table
|
||||
:dict="dict"
|
||||
:tableData="tableData"
|
||||
:col-configs="colConfigs"
|
||||
:total="total"
|
||||
v-loading="loading"
|
||||
style="margin-top: 6px;"
|
||||
:current.sync="search.current"
|
||||
:size.sync="search.size"
|
||||
@handleSelectionChange="handleSelectionChange"
|
||||
@getList="getList">
|
||||
<el-table-column slot="options" width="220px" fixed="right" label="操作" align="center">
|
||||
<template slot-scope="{ row }">
|
||||
<div class="table-options">
|
||||
<el-button type="text" @click="toDetail(row.id)">详情</el-button>
|
||||
<el-button type="text" @click="remove(row.id)">删除</el-button>
|
||||
|
||||
<!-- <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
|
||||
<el-button type="text" @click="showNeighbourSetting(row.id)"
|
||||
v-if="permissions('app_apppartyfourresident_detail')">四邻设置
|
||||
</el-button> -->
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<div slot="paginationBtns" class="party-table__btns">
|
||||
<span style="margin-right: 8px;" @click="removeAll">批量删除</span>
|
||||
</div>
|
||||
</ai-table>
|
||||
</template>
|
||||
</ai-list>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {mapState} from 'vuex'
|
||||
|
||||
export default {
|
||||
name: 'List',
|
||||
|
||||
props: {
|
||||
instance: Function,
|
||||
permissions: Function,
|
||||
dict: Object,
|
||||
selected: Object
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
search: {
|
||||
current: 1,
|
||||
size: 10,
|
||||
con: '',
|
||||
age: [],
|
||||
sex: '',
|
||||
nation: '',
|
||||
partyStatus: '',
|
||||
flowStatus: '',
|
||||
education: '',
|
||||
partyPosition: '',
|
||||
birthStart: '',
|
||||
birthEnd: '',
|
||||
turnPositiveStart: '',
|
||||
turnPositiveEnd: '',
|
||||
joinPartyStart: '',
|
||||
joinPartyEnd: ''
|
||||
},
|
||||
orgName: '',
|
||||
loading: false,
|
||||
total: 0,
|
||||
colConfigs: [
|
||||
{type: 'selection', label: ''},
|
||||
{prop: 'name', label: '姓名', align: 'center'},
|
||||
{prop: 'sex', label: '性别', align: 'center', dict: 'sex'},
|
||||
{prop: 'age', label: '年龄', align: 'center'},
|
||||
{prop: 'joinPartyTime', label: '入学申请日期', align: 'center'},
|
||||
{prop: 'flowStatus', label: '发展状态', align: 'center', dict: 'flowStatus'},
|
||||
],
|
||||
tableData: [],
|
||||
ids: '',
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
...mapState(['user']),
|
||||
orgTree() {
|
||||
return this.$refs.tree?.$refs?.partyTree
|
||||
},
|
||||
exportQuery() {
|
||||
let {id: partyOrgId} = this.selected
|
||||
return {
|
||||
ids: this.ids ? this.ids.split(',') : [],
|
||||
...this.search, partyOrgId
|
||||
}
|
||||
},
|
||||
isShowAddBtn() {
|
||||
return this.selected.isLeaf == 1
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.dict.load('disciplinary', 'partyType', 'sex', 'nation', 'education', 'partyStatus', 'partyPosition', 'flowStatus', 'auditStatus')
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
showNeighbourSetting(id) {
|
||||
this.$router.push({query: {id}, hash: "#ns"})
|
||||
},
|
||||
onTreeChange(e) {
|
||||
this.$emit("update:selected", e)
|
||||
this.getList(e.id)
|
||||
},
|
||||
|
||||
onSearch(v) {
|
||||
this.orgTree.filter(v)
|
||||
},
|
||||
|
||||
getList(partyOrgId) {
|
||||
if (!this.user.info.organizationId) return
|
||||
|
||||
this.loading = true
|
||||
partyOrgId = partyOrgId || this.selected.id
|
||||
this.instance.post(`/app/appparty/list`, null, {
|
||||
params: {partyOrgId, ...this.search, age: this.search.age?.join(',')}
|
||||
}).then(res => {
|
||||
this.loading = false
|
||||
if (res?.data) {
|
||||
this.tableData = res.data.records
|
||||
this.total = res.data.total
|
||||
}
|
||||
}).catch(() => {
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
removeAll() {
|
||||
if (!this.ids) {
|
||||
return this.$message.error('请选择党员')
|
||||
}
|
||||
this.remove(this.ids)
|
||||
},
|
||||
handleSelectionChange(e) {
|
||||
this.ids = e.map(v => v.id).join(',')
|
||||
},
|
||||
filterNode(value, data) {
|
||||
if (!value) return true
|
||||
return data.name.indexOf(value) !== -1
|
||||
},
|
||||
remove(id) {
|
||||
this.$confirm('确定删除该数据？').then(() => {
|
||||
this.instance.post(`/app/appparty/delete?ids=${id}`).then(res => {
|
||||
if (res.code == 0) {
|
||||
this.$message.success('删除成功！')
|
||||
this.getList()
|
||||
}
|
||||
})
|
||||
})
|
||||
},
|
||||
toDetail(id) {
|
||||
this.$router.push({query: {id}})
|
||||
},
|
||||
toAdd(id) {
|
||||
this.$router.push({query: {id}, hash: "#add"})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.partyList {
|
||||
.party-table__btns {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
::v-deep .audit-0 {
|
||||
color: #FF8822 !important;
|
||||
}
|
||||
|
||||
::v-deep .audit-1 {
|
||||
color: #2EA222 !important;
|
||||
}
|
||||
|
||||
::v-deep .ai-list__content--right {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
margin-left: 1px;
|
||||
box-shadow: none;
|
||||
|
||||
.ai-list__content--right-wrapper {
|
||||
width: 100%;
|
||||
}
|
||||
}
|
||||
::v-deep .is-current>.el-tree-node__content{
|
||||
width: 100%!important;
|
||||
padding-right: 16px!important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,228 @@
|
||||
<template>
|
||||
<section class="neighbourSetting">
|
||||
<ai-list>
|
||||
<ai-title slot="title" title="四邻设置" isShowBottomBorder isShowBack @onBackClick="back"/>
|
||||
<template #content>
|
||||
<ai-search-bar>
|
||||
<template #left>
|
||||
<el-button type="primary" icon="iconfont iconAdd" @click="dialog=true">添加</el-button>
|
||||
<el-button icon="iconfont iconDelete" :disabled="!search.ids" @click="handleDelete(search.ids)">删除
|
||||
</el-button>
|
||||
</template>
|
||||
<template #right>
|
||||
<el-input size="small" placeholder="搜索户主姓名" v-model="search.residentName" clearable
|
||||
@change="page.current=1,getTableData()" suffix-icon="iconfont iconSearch"/>
|
||||
</template>
|
||||
</ai-search-bar>
|
||||
<ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
|
||||
@getList="getTableData" :col-configs="colConfigs" :dict="dict"
|
||||
@selection-change="v=>search.ids=v.map(e=>e.pfrId).toString()">
|
||||
<el-table-column slot="options" label="操作" fixed="right" align="center">
|
||||
<template slot-scope="{row}">
|
||||
<el-button type="text" @click="handleDelete(row.pfrId)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</ai-table>
|
||||
</template>
|
||||
</ai-list>
|
||||
<ai-dialog title="添加户主" :visible.sync="dialog" @closed="clearDialog" @onConfirm="submit"
|
||||
width="1200px">
|
||||
<ai-area-get v-model="form.areaId" :instance="instance" :root="user.info.areaId"
|
||||
@change="list.current=1,getResident()"/>
|
||||
<el-row type="flex" class="mar-t16">
|
||||
<ai-table ref="Residents" :tableData="residents" :total="list.total" :current.sync="list.current"
|
||||
:size.sync="list.size" class="fill" border height="360px" @getList="getResident"
|
||||
:col-configs="[{slot: 'resident'}]" layout="slot,->, prev, pager, next, jumper" :pagerCount="5">
|
||||
<el-table-column slot="resident">
|
||||
<template #header>
|
||||
<b v-text="`户主信息列表`"/>
|
||||
<el-input class="fill searchbar" v-model="list.con" size="small" placeholder="搜索姓名/身份证号" clearable
|
||||
@change="list.current=1,getResident()"/>
|
||||
</template>
|
||||
<template slot-scope="{row}">
|
||||
<el-row type="flex" justify="space-between" @click.native="handleSelectResident(row)" class="toggle"
|
||||
:class="{selected:findResident(row.id)>-1}">
|
||||
<span v-text="row.name"/>
|
||||
<span v-text="idCardNoUtil.hideId(row.idNumber)"/>
|
||||
</el-row>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</ai-table>
|
||||
<ai-table :tableData="form.residentList" :col-configs="[{slot:'resident'}]" :isShowPagination="false" border
|
||||
height="360px">
|
||||
<el-table-column slot="resident">
|
||||
<template #header>
|
||||
<b v-text="`已选择`"/>
|
||||
<el-button type="text" @click="form.residentList=[]">清空</el-button>
|
||||
</template>
|
||||
<template slot-scope="{row,$index}">
|
||||
<el-row type="flex" align="middle" justify="space-between">
|
||||
<div v-text="[row.residentName, idCardNoUtil.hideId(row.idNumber)].join(' ')"/>
|
||||
<el-button type="text" @click="form.residentList.splice($index,1)">删除</el-button>
|
||||
</el-row>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</ai-table>
|
||||
</el-row>
|
||||
</ai-dialog>
|
||||
</section>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {mapState} from "vuex";
|
||||
|
||||
export default {
|
||||
name: "neighbourSetting",
|
||||
props: {
|
||||
instance: Function,
|
||||
dict: Object,
|
||||
},
|
||||
computed: {
|
||||
...mapState(['user']),
|
||||
colConfigs() {
|
||||
return [
|
||||
{type: 'selection'},
|
||||
{label: "户主姓名", prop: "name"},
|
||||
{label: "身份证号", prop: "idNumber"},
|
||||
{label: "联系方式", prop: "phone"},
|
||||
{label: "添加时间", prop: "createTime"},
|
||||
{slot: "options"}
|
||||
]
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
search: {residentName: "", ids: ""},
|
||||
page: {current: 1, size: 10, total: 0},
|
||||
tableData: [],
|
||||
dialog: false,
|
||||
form: {areaId: "", residentList: []},
|
||||
residents: [],
|
||||
list: {current: 1, size: 10, total: 0},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
back() {
|
||||
this.$router.push({})
|
||||
},
|
||||
getTableData() {
|
||||
this.instance.post("/app/apppartyfourresident/listFourResident", null, {
|
||||
params: {...this.page, ...this.search}
|
||||
}).then(res => {
|
||||
if (res?.data) {
|
||||
this.tableData = res.data?.records
|
||||
this.page.total = res.data.total
|
||||
}
|
||||
})
|
||||
},
|
||||
handleDelete(ids) {
|
||||
this.$confirm("是否要删除户主?").then(() => {
|
||||
this.instance.post("/app/apppartyfourresident/delete", null, {
|
||||
params: {ids}
|
||||
}).then(res => {
|
||||
if (res?.code == 0) {
|
||||
this.$message.success("删除成功!")
|
||||
this.getTableData()
|
||||
}
|
||||
})
|
||||
}).catch(() => 0)
|
||||
},
|
||||
submit() {
|
||||
this.instance.post("/app/apppartyfourresident/add", this.form).then(res => {
|
||||
if (res?.code == 0) {
|
||||
this.$message.success("提交成功!")
|
||||
this.dialog = false
|
||||
this.getTableData()
|
||||
}
|
||||
})
|
||||
},
|
||||
getResident() {
|
||||
let {areaId} = this.form
|
||||
areaId = areaId || this.user.info.areaId
|
||||
this.instance.post("/app/appresident/list", null, {
|
||||
params: {householdName: 1, areaId, ...this.list, auditStatus: 1}
|
||||
}).then(res => {
|
||||
if (res?.data) {
|
||||
// this.residents = res.data.records?.map(e => ({dictValue: e.id, dictName: e.name}))
|
||||
this.residents = res.data.records
|
||||
this.list.total = res.data.total
|
||||
this.$refs.Residents.doLayout()
|
||||
}
|
||||
})
|
||||
},
|
||||
handleSelectResident(row) {
|
||||
let {id: partyId} = this.$route.query
|
||||
let index = this.findResident(row.id)
|
||||
if (index > -1) {
|
||||
this.form.residentList.splice(index, 1)
|
||||
} else {
|
||||
let {id: residentId, name: residentName, idNumber} = row
|
||||
this.form.residentList.push({residentId, residentName, idNumber, partyId})
|
||||
}
|
||||
this.$forceUpdate()
|
||||
},
|
||||
findResident(id) {
|
||||
return this.form.residentList?.findIndex(e => e.residentId == id)
|
||||
},
|
||||
clearDialog() {
|
||||
this.form = {residentList: []}
|
||||
this.residents = []
|
||||
this.list = {current: 1, size: 10, total: 0}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.search.partyId = this.$route.query.id
|
||||
this.getTableData()
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
.neighbourSetting {
|
||||
height: 100%;
|
||||
|
||||
.mar-t16 {
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
::v-deep.ai-dialog__content {
|
||||
.ai-dialog__content--wrapper {
|
||||
padding-right: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
.el-row {
|
||||
width: 100%;
|
||||
|
||||
.ai-table + .ai-table {
|
||||
margin-left: 16px;
|
||||
width: 400px;
|
||||
|
||||
.ai-table__header > .cell {
|
||||
line-height: 40px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.toggle {
|
||||
cursor: pointer;
|
||||
|
||||
&.selected {
|
||||
color: #26f;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
.ai-table__header > .cell {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
::v-deep.searchbar {
|
||||
padding-right: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user