c-zhangr1/zhgh_squ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

commit

Browse Source
This commit is contained in:
=
2026-06-16 15:49:36 +08:00
parent ec015a66df
commit b45f194355
14 changed files with 255 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/dayofficework/fund/member/batchJoin/index.html
+6 -6
View File
@@ -39,10 +39,10 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.personTypes" placeholder="请选择教职工类别" @change="doSearch"
code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="编制类别">
<dict-select v-model="pageForm.preparedBys" placeholder="请选择编制类别" @change="doSearch"
code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
</search-item>
<!-- <search-item label="编制类别">-->
<!-- <dict-select v-model="pageForm.preparedBys" placeholder="请选择编制类别" @change="doSearch"-->
<!-- code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>-->
<!-- </search-item>-->
</search>
</el-card>
<el-card shadow="never">
@@ -106,7 +106,7 @@ layout("/layouts/platform.html"){
{ label: "出生年月", prop: "birthday" },
{ label: "在职状态", prop: "userState", sortable: true },
{ label: "教职工类别", prop: "personType", sortable: true },
{ label: '编制类别', prop: 'preparedBy', sortable: true },
// { label: '编制类别', prop: 'preparedBy', sortable: true },
{ label: "所属工会", prop: "unionName" },
{ label: "所属单位", prop: "unitName" },
],
@@ -163,7 +163,7 @@ layout("/layouts/platform.html"){
const pageForm = clone(this.pageForm)
pageForm.userStates = JSON.stringify(this.pageForm.userStates)
pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
// pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
this.$axios.post('/platform/fundMember/batchJoin/pageData', pageForm)
.then(res => {
this.tableData = res.data.list
src/main/resources/views/platform/zhgh/dayofficework/fund/member/info.js
+18 -2
View File
@@ -3,11 +3,15 @@ const fundMemberInfo = {
<div>
<div class="process-title">
申请信息
<el-link type="primary" @click="openChart">点击查看流程图</el-link>
<el-link type="primary" @click="openChart" v-if="row && row.instanceId">点击查看流程图</el-link>
</div>
<el-descriptions :column="2" border>
<el-descriptions-item label="姓名">{{viewData.userName}}</el-descriptions-item>
<el-descriptions-item label="工号">{{viewData.loginName}}</el-descriptions-item>
<el-descriptions-item label="会员类别">{{viewData.aidFundMemberType}}</el-descriptions-item>
<el-descriptions-item label="在职状态">{{viewData.userState}}</el-descriptions-item>
<el-descriptions-item label="所属工会">{{viewData.unionName}}</el-descriptions-item>
<el-descriptions-item label="所属单位">{{viewData.unitName}}</el-descriptions-item>
<el-descriptions-item label="性别">{{viewData.sex}}</el-descriptions-item>
<el-descriptions-item label="出生年月">{{viewData.birthday}}</el-descriptions-item>
<el-descriptions-item label="身份证号码">{{viewData.idCard}}</el-descriptions-item>
@@ -72,21 +76,29 @@ const fundMemberInfo = {
onOpen(row) {
this.row = row
this.visible = true
this.viewData = Object.assign({}, row || {})
this.doneTasks = []
this.getInfo()
this.getDoneTasks()
},
// 获取申请信息
getInfo() {
if (!this.row || !this.row.id) {
return
}
this.$axios.post('/platform/fundMember/common/info', {id: this.row.id}).then((res) => {
if (res.code === 0) {
this.viewData = res.data
this.viewData = Object.assign({}, this.viewData, res.data || {})
}
})
},
// 获取已办任务审批记录
getDoneTasks() {
if (!this.row || !this.row.instanceId) {
return
}
this.$axios.post("/flow/common/doneTasks", {bizId: this.row.id}).then((res) => {
if (res.code === 0) {
this.doneTasks = res.data
@@ -96,6 +108,10 @@ const fundMemberInfo = {
// 查看流程图
openChart() {
if (!this.row || !this.row.instanceId) {
this.$message.warning("暂无流程信息")
return
}
this.$refs.snakerChartRef.onOpenFull(this.row.instanceProcessDefineId, this.row.instanceId)
}
}
src/main/resources/views/platform/zhgh/dayofficework/fund/member/query/index.html
+32 -11
View File
@@ -39,14 +39,14 @@ layout("/layouts/platform.html"){
<dict-select v-model="pageForm.userStates" placeholder="请选择在职状态" @change="doSearch"
code="USER_STATE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="教职工类别">
<dict-select v-model="pageForm.personTypes" placeholder="请选择教职工类别" @change="doSearch"
code="USER_PERSON_TYPE" multiple collapse-tags></dict-select>
</search-item>
<search-item label="编制类别">
<dict-select v-model="pageForm.preparedBys" placeholder="请选择编制类别" @change="doSearch"
code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>
<search-item label="会员类别">
<dict-select v-model="pageForm.aidFundMemberTypes" placeholder="请选择会员类别" @change="doSearch"
code="USER_AID_FUND_MEMBER_TYPE" multiple collapse-tags></dict-select>
</search-item>
<!-- <search-item label="编制类别">-->
<!-- <dict-select v-model="pageForm.preparedBys" placeholder="请选择编制类别" @change="doSearch"-->
<!-- code="USER_PREPARED_BY_TYPE" multiple collapse-tags></dict-select>-->
<!-- </search-item>-->
</search>
</el-card>
<el-card shadow="never">
@@ -78,6 +78,11 @@ layout("/layouts/platform.html"){
<el-tag v-if="row.isJoin" size="small">加入</el-tag>
<el-tag v-else size="small" type="danger">退出</el-tag>
</template>
<template v-else-if="column.prop === 'aidFundMemberType'" scope="{row}">
<dict-select v-model="row.aidFundMemberType" placeholder="请选择会员类别"
code="USER_AID_FUND_MEMBER_TYPE" style="width: 100%"
@change="onAidFundMemberTypeChange(row)"></dict-select>
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" width="200px">
<template slot-scope="{row}">
@@ -113,8 +118,8 @@ layout("/layouts/platform.html"){
{ label: "性别", prop: "sex" },
{ label: "出生年月", prop: "birthday" },
{ label: "在职状态", prop: "userState", sortable: true },
{ label: "教职工类别", prop: "personType", sortable: true },
{ label: '编制类别', prop: 'preparedBy', sortable: true },
{ label: "会员类别", prop: "aidFundMemberType", sortable: true },
// { label: '编制类别', prop: 'preparedBy', sortable: true },
{ label: "所属工会", prop: "unionName" },
{ label: "所属单位", prop: "unitName" },
{ label: "加入时间", prop: "joinTime" },
@@ -151,6 +156,22 @@ layout("/layouts/platform.html"){
})
},
// 修改会员类别
onAidFundMemberTypeChange(row) {
this.$axios.post('/platform/fundMember/query/updateAidFundMemberType', {
loginName: row.loginName,
aidFundMemberType: row.aidFundMemberType
}).then((res) => {
if (res.code === 0) {
this.$message.success('修改成功')
} else {
this.pageData()
}
}).catch(() => {
this.pageData()
})
},
// 备份会员
backup() {
// 此处需要选择年份
@@ -200,8 +221,8 @@ layout("/layouts/platform.html"){
pageData() {
const pageForm = clone(this.pageForm)
pageForm.userStates = JSON.stringify(this.pageForm.userStates)
pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
pageForm.aidFundMemberTypes = JSON.stringify(this.pageForm.aidFundMemberTypes)
// pageForm.preparedBys = JSON.stringify(this.pageForm.preparedBys)
this.$axios.post('/platform/fundMember/query/pageData', pageForm)
.then(res => {
this.tableData = res.data.list
src/main/resources/views/platform/zhgh/dayofficework/fund/member/write/index.html
+11 -1
View File
@@ -79,6 +79,15 @@ layout("/layouts/platform.html"){
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="会员类别" prop="aidFundMemberType">
<dict-select v-model="formData.aidFundMemberType" placeholder="请选择会员类别"
code="USER_AID_FUND_MEMBER_TYPE" style="width: 100%"></dict-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="手机号码" prop="mobile">
@@ -134,7 +143,7 @@ layout("/layouts/platform.html"){
sex: [{required: true, message: '请选择性别', trigger: 'blur'}],
idCard: [{required: true, message: '请输入身份证号码', trigger: 'blur'},
{
pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(1[0-2]))([0-2][1-9]|3[0-1])\d{3}[Xx\d]$/,
pattern: /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[Xx\d]$/,
message: '请输入正确的身份证号码',
trigger: 'blur'
}
@@ -142,6 +151,7 @@ layout("/layouts/platform.html"){
address: [{required: true, message: '请输入家庭住址', trigger: 'blur'}],
joinWorkTime: [{required: true, message: '请选择参加工作时间', trigger: 'blur'}],
retireTime: [{required: false, message: '请选择退休时间', trigger: 'blur'}],
aidFundMemberType: [{required: true, message: '请选择会员类别', trigger: 'change'}],
mobile: [{required: true, message: '请输入手机号码', trigger: 'blur'},
{
pattern: /^1[3456789]\d{9}$/,