kubbo/dvcp_v2_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

Browse Source
This commit is contained in:
yanran200730
2022-10-17 17:08:58 +08:00
parent fa2e1968bb 91ac09a2e3
commit 8832a8365c
6 changed files with 486 additions and 996 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
project/pingchang/apps/AppGeneralElection/components/electionAdd.vue
View File

@@ -7,26 +7,28 @@
<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>
<span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit = true">修改</span>
</template>
<template #content v-if="isEdit == false">
<ai-wrapper>
<ai-info-item label="标题" :value="info.title"></ai-info-item>
<ai-info-item label="投票说明" :value="info.votingInstructions"></ai-info-item>
<ai-info-item label="单位名称" :value="info.organizationName"></ai-info-item>
<ai-info-item label="选举方式" :value="info.electionMethod"></ai-info-item>
<ai-info-item label="选举方式">
{{ info.electionMethod==0? '等额':'差额'}}
</ai-info-item>
<ai-info-item label="应选人数" :value="info.candidatesNumber"></ai-info-item>
<ai-info-item label="投票日期" :value="info.votingDate"></ai-info-item>
<ai-info-item label="候选人" isLine>
<span v-for="(item,index) in candidateUsersList" :key="index">
{{ item }}
<span v-if="index < candidateUsersList.length - 1">,</span>
<span v-if="index < candidateUsersList.length - 1">、</span>
</span>
</ai-info-item>
<ai-info-item label="投票人" isLine :value="info.voteUsers">
<span v-for="(item,index) in voteUsersList" :key="index">
{{ item }}
<span v-if="index < voteUsersList.length - 1">,</span>
<span v-if="index < voteUsersList.length - 1">、</span>
</span>
</ai-info-item>
</ai-wrapper>
@@ -34,7 +36,7 @@
</ai-card>
</template>
</ai-detail>
<ai-detail v-else>
<ai-detail v-if="!id || isEdit">
<ai-title slot="title" :title="id? '编辑换届选举':'添加换届选举'" isShowBottomBorder isShowBack @onBackClick="cancel(true)"/>
<template slot="content">
<ai-card title="基本信息">
@@ -64,14 +66,14 @@
<i class="el-icon-info" style="margin-right: 8px"></i>
</el-tooltip>
<el-radio v-model="form.electionMethod" label="1">等额</el-radio>
<el-radio v-model="form.electionMethod" label="2">差额</el-radio>
<el-radio v-model="form.electionMethod" label="0">等额</el-radio>
<el-radio v-model="form.electionMethod" label="1">差额</el-radio>
</el-form-item>
<el-row type="flex">
<el-col :span="20">
<el-form-item label="应选人数" prop="candidatesNumber">
<el-input type="number" v-model="form.candidatesNumber" placeholder="请输入"></el-input>
<el-form-item label="应选人数" prop="chooseNumber">
<el-input type="number" v-model="form.chooseNumber" placeholder="请输入"></el-input>
</el-form-item>
</el-col>
<el-col :span="20">
@@ -89,7 +91,7 @@
<template name="option" v-slot:option="{ item }">
<span class="iconfont iconProlife">{{ item.name }}</span>
<span>{{ item.phone }}</span>
<!-- <span>{{ item}}</span> -->
<span>{{ item}}</span>
</template>
</ai-person-select>
</el-form-item>
@@ -148,7 +150,7 @@ export default {
votingInstructions: '',
organizationName: '',
electionMethod: '',
candidatesNumber: '',
chooseNumber: '',
votingDate: '',
candidateUsers: [],
voteUsers: [],
@@ -159,7 +161,7 @@ export default {
title: [{required: true, message: "请输入标题", trigger: "blur"}],
organizationName: [{required: true, message: "请选择党组织", trigger: "blur"}],
electionMethod: [{required: true, message: "请选择选举方式", trigger: "blur"}],
candidatesNumber: [{required: true, message: "请输入应选人数", trigger: "blur"}],
chooseNumber: [{required: true, message: "请输入应选人数", trigger: "blur"}],
votingDate: [{required: true, message: "请选择投票日期", trigger: "blur"}],
candidateUsers: [{required: true,validator: validCandidate, trigger: "blur"}],
voteUsers: [{required: true,validator: validVote, trigger: "blur"}],
@@ -192,15 +194,15 @@ export default {
params: {id:this.id}
}).then((res) => {
if(res?.data) {
// console.log(res.data);
this.form = res.data,
console.log(res.data,'getDetail');
this.form = res.data
this.form.organizationName = res.data.partyOrganizations[0].name
this.info = res.data
this.candidateUsersList = res.data.candidateUsers.map(v=> v.name)
this.voteUsersList = res.data.voteUsers.map(v=> v.name)
}
})
},
edit() {},
selectCandidate(v) {
this.form.candidateUsers = v
},
@@ -223,12 +225,8 @@ export default {
...this.form
}).then(res => {
if(res.code == 0) {
if(this.id) {
this.$message.success('编辑成功')
} else {
this.$message.success('新增成功')
}
this.cancel(false)
this.$message.success(this.id ? '编辑成功' : '新增成功')
this.cancel(true)
}
}).catch((err) => {
console.log(err);

34
project/pingchang/apps/AppGeneralElection/components/electionList.vue
View File

@@ -6,10 +6,10 @@
<ai-search-bar>
<template #left>
<el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('', false)" >添加</el-button>
<ai-select v-model="search.status" @change=";(page.current = 1), getList()" placeholder="请选择状态" :selectList="dict.getDict('cwpStatus')"></ai-select>
<ai-select v-model="search.status" @change=";(page.current = 1), getList()" placeholder="请选择状态" :selectList="dict.getDict('electionStatus')"></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 v-model="search.title" 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>
@@ -17,7 +17,6 @@
<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, true)">编辑</el-button>
<el-button type="text" @click.native="toAdd(row.id, false)">详情</el-button>
<el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
@@ -51,17 +50,18 @@ export default {
}
},
created () {
this.dict.load('yesOrNo', 'partyFourLinkageStatus')
this.getList()
this.$dict.load('electionStatus', 'electionMethod').then(()=> {
this.getList()
})
},
computed: {
colConfigs() {
return [
{prop: "title", label: "标题", align: "left", showOverflowTooltip: true},
{prop: "organizationName", label: "所属支部", align: "center"},
{prop: "electionMethod", label: "选举方式", align: "center"},
{prop: "electionMethod", label: "选举方式", align: "center",dict:"electionMethod"},
{prop: "chooseNumber", label: "应选人数", align: "center"},
{prop: "status", label: "状态", align: "center",width: "180px"},
{prop: "status", label: "状态", align: "center",width: "180px", dict: "electionStatus"},
{ slot: "options", },
]
}
@@ -76,7 +76,7 @@ export default {
}).then(res=> {
if(res?.data) {
this.tableData = res.data.records
this.total.total = res.data.total
this.page.total = res.data.total
}
})
},
@@ -89,7 +89,23 @@ export default {
}
})
},
reset() {},
handleDelete(id) {
this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appgeneralelectioninfo/delete?ids=${id}`).then(res=>{
if(res.code == 0) {
this.$message.success('删除成功！')
this.getList()
}
})
})
},
reset() {
this.search = {
status: '',
title: '',
}
this.getList()
},
}
}
</script>

2
project/pingchang/apps/AppRecruitPartyMembers/AppRecruitPartyMembers.vue
View File

@@ -25,7 +25,7 @@ export default {
},
data() {
return {
selected: {}
selected: {},
}
},
computed: {

1043
project/pingchang/apps/AppRecruitPartyMembers/components/Add.vue
View File

File diff suppressed because it is too large Load Diff

295
project/pingchang/apps/AppRecruitPartyMembers/components/Detail.vue
View File

@@ -2,7 +2,7 @@
<ai-detail class="party-detail">
<template slot="title">
<ai-title
title="党员信息详情"
title="发展党员信息详情"
isShowBack
isShowBottomBorder
@onBackClick="cancel(true)"
@@ -35,7 +35,7 @@
: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="发展状态">{{ dict.getLabel('developStatus', info.developStatus)}}</ai-info-item>
<ai-info-item
label="籍贯"
isLine
@@ -44,7 +44,7 @@
<ai-info-item
label="户籍地"
isLine
:value="info.householdAreaName"
:value="info.householdAddressName"
></ai-info-item>
</ai-wrapper>
</template>
@@ -52,11 +52,11 @@
<ai-card title="联络信息">
<template #content>
<ai-wrapper label-width="150px">
<ai-info-item label="联系方式">{{ info.name }}</ai-info-item>
<ai-info-item label="联系方式">{{ info.phone }}</ai-info-item>
<ai-info-item
label="现住址"
isLine
:value="info.householdAreaName"
:value="info.currentAddressName"
></ai-info-item>
</ai-wrapper>
</template>
@@ -64,91 +64,92 @@
<ai-card title="团籍信息">
<template #content>
<ai-wrapper label-width="150px">
<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="入团日期">{{ info.joinLeagueMemberTime }}</ai-info-item>
<ai-info-item label="文化程度">{{ dict.getLabel('education', info.education) }}</ai-info-item>
<ai-info-item label="学位职称">{{ info.position }}</ai-info-item>
<ai-info-item label="奖励情况" isLine :value="info.rewardRemark"></ai-info-item>
<ai-info-item label="处分情况" isLine :value="info.punishmentRemark"></ai-info-item>
<ai-info-item label="简历" isLine :value="info.resume"></ai-info-item>
<ai-info-item label="附件" isLine>
<ai-file-list v-if="info.files && info.files.length"
:fileList="info.files"
<ai-file-list v-if="info.fileList && info.fileList.length"
:fileList="info.fileList"
:fileOps="{ name: 'name', size: 'fileSizeStr' }"
></ai-file-list>
</ai-info-item>
</ai-wrapper>
</template>
</ai-card>
<ai-card title="申请入学">
<ai-card title="申请入党">
<template #content>
<ai-wrapper label-width="150px">
<ai-info-item label="申请入学时间">{{ info.name }}</ai-info-item>
<ai-info-item label="申请入党时间">{{ info.applyJoinPartyTime }}</ai-info-item>
<ai-info-item
label="申请入学形式"
label="申请入党形式"
isLine
:value="info.householdAreaName"
:value="info.applyJoinPartyWay"
></ai-info-item>
</ai-wrapper>
</template>
</ai-card>
<ai-card title="入学积极分子的确定和教育培养">
<ai-card title="入党积极分子的确定和教育培养" v-if="info.developStatus > 0">
<template #content>
<ai-wrapper label-width="150px">
<ai-info-item label="确定为入学积极分子时间" isLine>{{ 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>{{ info.activistTime }}</ai-info-item>
<ai-info-item label="确定为积极分子的根据和意见" isLine :value="info.activistAccordingRemark"></ai-info-item>
<ai-info-item label="培养教育情况及鉴定意见" isLine :value="info.activistEducationRemark"></ai-info-item>
</ai-wrapper>
</template>
</ai-card>
<ai-card title="入学介绍人/培养人">
<ai-card title="入党介绍人/培养人" v-if="info.developStatus > 0">
<template #content>
<ai-table
:border="true"
:tableData="info.starList"
:tableData="info.introducerList"
:isShowPagination="false"
:col-configs="colConfigs1"
:col-configs="colConfigs"
:stripe="false"
@getList="() => {}"
>
</ai-table>
</template>
</ai-card>
<ai-card title="发展对象的确定和考察">
<ai-card title="发展对象的确定和考察" v-if="info.developStatus > 1">
<template #content>
<ai-wrapper label-width="150px">
<ai-info-item label="确定为发展对象时间" isLine>{{ 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 :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 :value="info.householdAreaName"></ai-info-item>
<ai-info-item label="支委会研究意见" isLine :value="info.householdAreaName"></ai-info-item>
<ai-info-item label="确定为发展对象时间" isLine>{{ info.determineTime }}</ai-info-item>
<ai-info-item label="政治历史的考察及结论" isLine :value="info.determinePoliticsRemark"></ai-info-item>
<ai-info-item label="社会关系考察及结论" isLine :value="info.determineSocialRemark"></ai-info-item>
<ai-info-item label="现实考察及结论" isLine :value="info.determineRealityRemark"></ai-info-item>
<ai-info-item label="党的基本知识考核及考试成绩" isLine :value="info.determineKnowledgeRemark"></ai-info-item>
<ai-info-item label="综合考察结论意见" isLine :value="info.determineComprehensiveRemark"></ai-info-item>
<ai-info-item label="党内讨论是否确定为发展对象的意见" isLine :value="info.determinePartyInnerRemark"></ai-info-item>
<ai-info-item label="确定为发展对象后的谈话记录" isLine :value="info.determineChatRemark"></ai-info-item>
<ai-info-item label="支委会研究意见" isLine :value="info.determineBranchRemark"></ai-info-item>
</ai-wrapper>
</template>
</ai-card>
<ai-card title="预备学员的接收">
<ai-card title="预备党员的接收" v-if="info.developStatus > 2">
<template #content>
<ai-wrapper label-width="150px">
<ai-info-item label="吸收入学时间" isLine>{{ 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 :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>{{ info.acceptTime }}</ai-info-item>
<ai-info-item label="吸收入党地点" isLine :value="info.acceptAddress"></ai-info-item>
<ai-info-item label="吸收入党时支部大会上党员提的意见和要求及个人的态度" isLine :value="info.acceptBranchMeetingOpinion"></ai-info-item>
<ai-info-item label="预备期间的教育情况" isLine :value="info.acceptEducationRemark"></ai-info-item>
<ai-info-item label="党小组对其转正的讨论意见" isLine :value="info.acceptPartyGroupRemark"></ai-info-item>
<ai-info-item label="预备期间的考察情况" isLine :value="info.acceptInvestigateRemark"></ai-info-item>
<ai-info-item label="党支部对其转正的意见" isLine :value="info.acceptBranchRemark"></ai-info-item>
</ai-wrapper>
</template>
</ai-card>
<ai-card title="预备学员的教育考察和转正">
<ai-card title="预备党员的教育考察和转正" v-if="info.developStatus == 4">
<template #content>
<ai-wrapper label-width="150px">
<ai-info-item label="转正时间" isLine>{{ 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 :value="info.householdAreaName"></ai-info-item>
<ai-info-item label="转正时间" isLine>{{ info.becomePartyTime }}</ai-info-item>
<ai-info-item label="预备期间的教育情况" isLine :value="info.becomePartyEducationRemark"></ai-info-item>
<ai-info-item label="预备期间的考察情况" isLine :value="info.becomePartyInvestigateRemark"></ai-info-item>
<ai-info-item label="党小组对其转正的讨论意见" isLine :value="info.becomePartyGroupRemark"></ai-info-item>
<ai-info-item label="党支部对其转正的意见" isLine :value="info.becomePartyBranchRemark"></ai-info-item>
</ai-wrapper>
</template>
</ai-card>
@@ -172,59 +173,11 @@ export default {
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] : "-"),
},
{
prop: "starTime",
label: "职位",
align: "center",
formart: (v) => (v ? v.split(" ")[0] : "-"),
},
colConfigs: [
{prop: "name", label: "姓名", align: "center"},
{prop: "position", label: "职务", align: "center"},
],
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: {
@@ -232,150 +185,24 @@ export default {
},
created() {
this.getInfo();
this.dict.load("education", "sex", "nation", "developStatus").then(() => {
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("删除成功！");
id && this.instance.post(`/app/apppartydevelop/queryDetailById`, 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);
}
});
});
},
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({});
},

68
project/pingchang/apps/AppRecruitPartyMembers/components/List.vue
View File

@@ -24,41 +24,7 @@
<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="入学时间">
<ai-search label="入党时间">
<el-date-picker
size="small"
v-model="search.joinPartyStart"
@@ -96,7 +62,7 @@
<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>
<el-button size="small" :disabled="!ids.length" icon="iconfont iconDelete" @click="remove(ids)">删除</el-button>
</template>
<!-- <template #right>
<ai-import :instance="instance" :dict="dict" type="appparty" name="发展党员" @success="getList()"></ai-import>
@@ -118,6 +84,7 @@
<template slot-scope="{ row }">
<div class="table-options">
<el-button type="text" @click="toDetail(row.id)">详情</el-button>
<el-button type="text" @click="toAdd(row.id)">编辑</el-button>
<el-button type="text" @click="remove(row.id)">删除</el-button>
<!-- <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
@@ -155,15 +122,6 @@ export default {
con: '',
age: [],
sex: '',
nation: '',
partyStatus: '',
flowStatus: '',
education: '',
partyPosition: '',
birthStart: '',
birthEnd: '',
turnPositiveStart: '',
turnPositiveEnd: '',
joinPartyStart: '',
joinPartyEnd: ''
},
@@ -175,8 +133,8 @@ export default {
{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'},
{prop: 'applyJoinPartyTime', label: '申请入党日期', align: 'center'},
{prop: 'developStatus', label: '发展状态', align: 'center', dict: 'developStatus'},
],
tableData: [],
ids: '',
@@ -199,8 +157,10 @@ export default {
}
},
created() {
this.dict.load('disciplinary', 'partyType', 'sex', 'nation', 'education', 'partyStatus', 'partyPosition', 'flowStatus', 'auditStatus')
this.getList()
this.dict.load('sex', 'developStatus').then(() => {
this.getList()
})
},
methods: {
showNeighbourSetting(id) {
@@ -220,8 +180,8 @@ export default {
this.loading = true
partyOrgId = partyOrgId || this.selected.id
this.instance.post(`/app/appparty/list`, null, {
params: {partyOrgId, ...this.search, age: this.search.age?.join(',')}
this.instance.post(`/app/apppartydevelop/list`, null, {
params: {partyOrgId, ...this.search, ageStart: this.search.age[0] || '', ageEnd: this.search.age[1] || '',}
}).then(res => {
this.loading = false
if (res?.data) {
@@ -234,7 +194,7 @@ export default {
},
removeAll() {
if (!this.ids) {
return this.$message.error('请选择党员')
return this.$message.error('请选择发展党员')
}
this.remove(this.ids)
},
@@ -247,7 +207,7 @@ export default {
},
remove(id) {
this.$confirm('确定删除该数据？').then(() => {
this.instance.post(`/app/appparty/delete?ids=${id}`).then(res => {
this.instance.post(`/app/apppartydevelop/delete?ids=${id}`).then(res => {
if (res.code == 0) {
this.$message.success('删除成功！')
this.getList()
@@ -259,7 +219,7 @@ export default {
this.$router.push({query: {id}})
},
toAdd(id) {
this.$router.push({query: {id}, hash: "#add"})
this.$router.push({query: {id, partyOrgId: this.selected.id}, hash: "#add"})
}
}
}