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

会员

Browse Source
This commit is contained in:
Paidax
2025-08-30 12:08:47 +08:00
parent d907d3eb92
commit 623f9375b7
18 changed files with 388 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/mobile/member/apply/branchUnionAudit/index.html
+3
View File
@@ -305,6 +305,9 @@ layout("/mobile/platform.html"){
},
},
created() {
if (window.innerWidth > 768 && location.pathname === '/platform/member/apply/branchUnion/audit/h5') {
window.location.replace('/platform/member/apply/branchUnion/audit');
}
this.initData()
}
})
src/main/resources/views/mobile/member/apply/mine/index.html
+13
View File
@@ -128,6 +128,15 @@ layout("/mobile/platform.html"){
<member-apply-audit-info ref="memberApplyAuditInfoRef"></member-apply-audit-info>
</van-popup>
</div>
<!--<script>-->
<!-- (function() {-->
<!-- if (window.innerWidth > 768 && location.pathname === '/platform/member/apply/mine/h5') {-->
<!-- window.location.replace('/platform/member/apply/mine');-->
<!-- }-->
<!-- })();-->
<!--</script>-->
<script>
<!--#include('../common/memberApplyAuditInfo.js'){}#-->
@@ -222,6 +231,10 @@ layout("/mobile/platform.html"){
},
},
created() {
if (window.innerWidth > 768 && location.pathname === '/platform/member/apply/mine/h5') {
window.location.replace('/platform/member/apply/mine');
}
this.initData()
}
})
src/main/resources/views/mobile/member/apply/schoolUnionAudit/index.html
+3
View File
@@ -355,6 +355,9 @@ layout("/mobile/platform.html"){
},
},
created() {
if (window.innerWidth > 768 && location.pathname === '/platform/member/apply/schoolUnion/audit/h5') {
window.location.replace('/platform/member/apply/schoolUnion/audit');
}
this.initData()
}
})
src/main/resources/views/mobile/member/apply/submit/index.html
+4
View File
@@ -459,6 +459,10 @@ layout("/mobile/platform.html"){
}
},
async created(){
if (window.innerWidth > 768 && location.pathname === '/platform/member/apply/submit/h5') {
window.location.replace('/platform/member/apply/submit');
}
this.init()
await this.validateApply()
}
src/main/resources/views/mobile/platform.html
+9
View File
@@ -113,6 +113,15 @@
</head>
<body>
<script>
(function() {
if (window.innerWidth > 768 && location.pathname === '/mobile/index') {
window.location.replace('/platform/home');
}
})();
</script>
<script>
const APP_DOMAIN = "${AppDomain!}"
const FILE_DOMAIN = "${AppFileDomain!}"
src/main/resources/views/platform/member/apply/branchUnionAudit/index.html
+4 -1
View File
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
<el-tag type="warning" v-else>暂无</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="220">
<el-table-column label="操作" width="220" fixed="right">
<template slot-scope="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="[50].includes(row.applyStateId)" @click="openAudit(row)" size="mini" type="primary">审核</el-button>
@@ -203,6 +203,9 @@ layout("/layouts/platform.html"){
},
},
created(){
if (window.innerWidth < 768 && location.pathname === '/platform/member/apply/branchUnion/audit') {
window.location.replace('/platform/member/apply/branchUnion/audit/h5');
}
this.pageData()
}
})
src/main/resources/views/platform/member/apply/common/memberApplyAuditInfo.js
+27 -21
View File
@@ -32,26 +32,28 @@ const MEMBER_APPLY_AUDIT_INFO = {
<!-- <el-descriptions-item label="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</el-descriptions-item>-->
<!-- <el-descriptions-item></el-descriptions-item>-->
<el-descriptions-item label="家庭主要成员" :span="3">
<el-table v-if="viewData.families&&viewData.families.length"
:data="viewData.families" size="mini" border
:header-cell-style="{background:'#eff3f6'}"
style="width: 100%">
<el-table-column prop="relation" label="与本人关系" align="center" header-align="center">
</el-table-column>
<el-table-column prop="name" label="姓名" align="center" header-align="center">
</el-table-column>
<el-table-column prop="unit" label="单位" align="center" header-align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center" header-align="center">
</el-table-column>
</el-table>
<el-empty v-else :image-size="50" description="暂无家庭成员信息"></el-empty>
</el-descriptions-item>
<el-descriptions-item label="个人简况" :span="3">
<div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
<el-tag type="warning" v-else>暂无</el-tag>
</el-descriptions-item>
<template v-if="viewData.loginname === storageUser.loginname">
<el-descriptions-item label="家庭主要成员" :span="3">
<el-table v-if="viewData.families&&viewData.families.length"
:data="viewData.families" size="mini" border
:header-cell-style="{background:'#eff3f6'}"
style="width: 100%">
<el-table-column prop="relation" label="与本人关系" align="center" header-align="center">
</el-table-column>
<el-table-column prop="name" label="姓名" align="center" header-align="center">
</el-table-column>
<el-table-column prop="unit" label="单位" align="center" header-align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center" header-align="center">
</el-table-column>
</el-table>
<el-empty v-else :image-size="50" description="暂无家庭成员信息"></el-empty>
</el-descriptions-item>
<el-descriptions-item label="个人简况" :span="3">
<div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
<el-tag type="warning" v-else>暂无</el-tag>
</el-descriptions-item>
</template>
<el-descriptions-item label="签字信息" :span="3">
<el-image v-if="viewData.sign"
@@ -96,7 +98,8 @@ const MEMBER_APPLY_AUDIT_INFO = {
activeName: "basicInfo",
viewData: {
schoolAudit: {},
branchAudit: {}
branchAudit: {},
storageUser: {}
}
}
},
@@ -113,5 +116,8 @@ const MEMBER_APPLY_AUDIT_INFO = {
}
}
}
},
created() {
this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
}
}
src/main/resources/views/platform/member/apply/mine/index.html
+4 -1
View File
@@ -32,7 +32,7 @@ layout("/layouts/platform.html"){
<el-tag type="warning" v-else>暂无</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="220">
<el-table-column label="操作" width="220" fixed="right">
<template slot-scope="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="[10, 30, 60].includes(row.applyStateId) && row.userId == user.id"
@@ -125,6 +125,9 @@ layout("/layouts/platform.html"){
},
},
created(){
if (window.innerWidth < 768 && location.pathname === '/platform/member/apply/mine') {
window.location.replace('/platform/member/apply/mine/h5');
}
this.user = JSON.parse(window.sessionStorage.getItem('user'))
this.pageData()
}
src/main/resources/views/platform/member/apply/schoolUnionAudit/index.html
+4 -1
View File
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
<el-tag type="warning" v-else>暂无</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="220">
<el-table-column label="操作" width="220" fixed="right">
<template slot-scope="{row}">
<el-button @click="openView(row)" size="mini" type="primary">查看</el-button>
<el-button v-if="[20, 70].includes(row.applyStateId)" @click="openAudit(row)" size="mini" type="primary">
@@ -241,6 +241,9 @@ layout("/layouts/platform.html"){
},
},
async created(){
if (window.innerWidth < 768 && location.pathname === '/platform/member/apply/schoolUnion/audit') {
window.location.replace('/platform/member/apply/schoolUnion/audit/h5');
}
this.pageData()
this.unions = await getUnionList()
}
src/main/resources/views/platform/member/apply/submit/index.html
+3
View File
@@ -428,6 +428,9 @@ layout("/layouts/platform.html"){
}
},
async created(){
if (window.innerWidth < 768 && location.pathname === '/platform/member/apply/submit') {
window.location.replace('/platform/member/apply/submit/h5');
}
this.init()
this.units = await getUnits()
await this.validateApply()
src/main/resources/views/platform/member/change/common/memberAllChangeInfo.js
+30 -22
View File
@@ -37,27 +37,30 @@ const MEMBER_ALL_CHANGE_INFO = {
<el-descriptions-item label="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="家庭主要成员" :span="3">
<el-table v-if="viewData.families&&viewData.families.length"
:data="viewData.families" size="mini" border
:header-cell-style="{background:'#eff3f6'}"
style="width: 100%">
<el-table-column prop="relation" label="与本人关系" align="center" header-align="center">
</el-table-column>
<el-table-column prop="name" label="姓名" align="center" header-align="center">
</el-table-column>
<el-table-column prop="unit" label="单位" align="center" header-align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center" header-align="center">
</el-table-column>
</el-table>
<el-empty v-else :image-size="50" description="暂无家庭成员信息"></el-empty>
</el-descriptions-item>
<el-descriptions-item label="个人简况" :span="3">
<template slot="label">个人简况</template>
<div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
<span v-else>无数据</span>
</el-descriptions-item>
<template v-if="viewData.loginname === storageUser.loginname">
<el-descriptions-item label="家庭主要成员" :span="3">
<el-table v-if="viewData.families&&viewData.families.length"
:data="viewData.families" size="mini" border
:header-cell-style="{background:'#eff3f6'}"
style="width: 100%">
<el-table-column prop="relation" label="与本人关系" align="center" header-align="center">
</el-table-column>
<el-table-column prop="name" label="姓名" align="center" header-align="center">
</el-table-column>
<el-table-column prop="unit" label="单位" align="center" header-align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center" header-align="center">
</el-table-column>
</el-table>
<el-empty v-else :image-size="50" description="暂无家庭成员信息"></el-empty>
</el-descriptions-item>
<el-descriptions-item label="个人简况" :span="3">
<template slot="label">个人简况</template>
<div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
<span v-else>无数据</span>
</el-descriptions-item>
</template>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="历史变更记录" name="changeInfo" v-if="viewData.allChangeInfo">
@@ -91,7 +94,9 @@ const MEMBER_ALL_CHANGE_INFO = {
data(){
return{
viewData: {},
activeName: "basicInfo"
activeName: "basicInfo",
storageUser: {}
}
},
methods:{
@@ -105,5 +110,8 @@ const MEMBER_ALL_CHANGE_INFO = {
}
})
}
},
created() {
this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
}
}
src/main/resources/views/platform/member/change/common/memberChange.js
+57 -52
View File
@@ -239,58 +239,60 @@ const MEMBER_CHANGE = {
<el-descriptions-item></el-descriptions-item>
</template>
</template>
<el-descriptions-item label="家庭主要成员" :span="3">
<el-form-item prop="families">
<el-table :data="formData.families" border size="small">
<el-table-column label="关系" prop="relation">
<template slot-scope="{row}">
<el-input v-model="row.relation" maxlength="50"
placeholder="请输入与本人关系"></el-input>
</template>
</el-table-column>
<el-table-column label="姓名" prop="name">
<template slot-scope="{row}">
<el-input v-model="row.name" maxlength="50" placeholder="请输入姓名"></el-input>
</template>
</el-table-column>
<el-table-column label="工作单位" prop="unit">
<template slot-scope="{row}">
<el-input v-model="row.unit" maxlength="100"
placeholder="请输入工作单位"></el-input>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark">
<template slot-scope="{row}">
<el-input v-model="row.remark" maxlength="100" placeholder="请输入备注"></el-input>
</template>
</el-table-column>
<el-table-column width="100px">
<template slot="header" slot-scope="scope">
<el-button type="primary" size="mini" :disabled="allowFields('families')"
@click="formData.families.push({})">添加
</el-button>
</template>
<template slot-scope="scope">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="formData.families.length===0 || allowFields('families')"
@click="formData.families.splice(scope.$index,1)"
></el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-descriptions-item>
<template v-if="formData.loginname === storageUser.loginname">
<el-descriptions-item label="家庭主要成员" :span="3">
<el-form-item prop="families">
<el-table :data="formData.families" border size="small">
<el-table-column label="关系" prop="relation">
<template slot-scope="{row}">
<el-input v-model="row.relation" maxlength="50"
placeholder="请输入与本人关系"></el-input>
</template>
</el-table-column>
<el-table-column label="姓名" prop="name">
<template slot-scope="{row}">
<el-input v-model="row.name" maxlength="50" placeholder="请输入姓名"></el-input>
</template>
</el-table-column>
<el-table-column label="工作单位" prop="unit">
<template slot-scope="{row}">
<el-input v-model="row.unit" maxlength="100"
placeholder="请输入工作单位"></el-input>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark">
<template slot-scope="{row}">
<el-input v-model="row.remark" maxlength="100" placeholder="请输入备注"></el-input>
</template>
</el-table-column>
<el-table-column width="100px">
<template slot="header" slot-scope="scope">
<el-button type="primary" size="mini" :disabled="allowFields('families')"
@click="formData.families.push({})">添加
</el-button>
</template>
<template slot-scope="scope">
<el-button
type="danger"
icon="el-icon-delete"
size="mini"
:disabled="formData.families.length===0 || allowFields('families')"
@click="formData.families.splice(scope.$index,1)"
></el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="个人简历" :span="3">
<el-form-item prop="vita">
<text-editor v-model="formData.vita"></text-editor>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="个人简历" :span="3">
<el-form-item prop="vita">
<text-editor v-model="formData.vita"></text-editor>
</el-form-item>
</el-descriptions-item>
</template>
</el-descriptions>
</el-form>
<el-row justify="end" type="flex" class="mt10">
@@ -382,7 +384,9 @@ const MEMBER_CHANGE = {
]
},
welfareProjectList: []
welfareProjectList: [],
storageUser: {}
}
},
methods: {
@@ -511,7 +515,8 @@ const MEMBER_CHANGE = {
}
}
},
created(){
created() {
this.init()
this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
}
}
src/main/resources/views/platform/member/change/common/memberChangeAuditInfo.js
+30 -22
View File
@@ -38,27 +38,30 @@ const MEMBER_CHANGE_AUDIT_INFO = {
<el-descriptions-item label="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="家庭主要成员" :span="3">
<el-table v-if="viewData.families&&viewData.families.length"
:data="viewData.families" size="mini" border
:header-cell-style="{background:'#eff3f6'}"
style="width: 100%">
<el-table-column prop="relation" label="与本人关系" align="center" header-align="center">
</el-table-column>
<el-table-column prop="name" label="姓名" align="center" header-align="center">
</el-table-column>
<el-table-column prop="unit" label="单位" align="center" header-align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center" header-align="center">
</el-table-column>
</el-table>
<el-empty v-else :image-size="50" description="暂无家庭成员信息"></el-empty>
</el-descriptions-item>
<el-descriptions-item label="个人简况" :span="3">
<template slot="label">个人简况</template>
<div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
<span v-else>无数据</span>
</el-descriptions-item>
<template v-if="viewData.loginname === storageUser.loginname">
<el-descriptions-item label="家庭主要成员" :span="3">
<el-table v-if="viewData.families&&viewData.families.length"
:data="viewData.families" size="mini" border
:header-cell-style="{background:'#eff3f6'}"
style="width: 100%">
<el-table-column prop="relation" label="与本人关系" align="center" header-align="center">
</el-table-column>
<el-table-column prop="name" label="姓名" align="center" header-align="center">
</el-table-column>
<el-table-column prop="unit" label="单位" align="center" header-align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center" header-align="center">
</el-table-column>
</el-table>
<el-empty v-else :image-size="50" description="暂无家庭成员信息"></el-empty>
</el-descriptions-item>
<el-descriptions-item label="个人简况" :span="3">
<template slot="label">个人简况</template>
<div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
<span v-else>无数据</span>
</el-descriptions-item>
</template>
</el-descriptions>
</el-tab-pane>
<el-tab-pane label="变更信息" name="changeInfo" v-if="viewData.changeInfos">
@@ -108,7 +111,9 @@ const MEMBER_CHANGE_AUDIT_INFO = {
viewData: {
changeInfos: [],
schoolAudit: {},
branchAudit: {}
branchAudit: {},
storageUser: {}
}
}
},
@@ -119,5 +124,8 @@ const MEMBER_CHANGE_AUDIT_INFO = {
this.viewData = resp.data
}
}
},
created() {
this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
}
}
src/main/resources/views/platform/member/common/memberInfo.js
+23 -17
View File
@@ -38,22 +38,24 @@ const MEMBER_INFO = {
<el-descriptions-item label="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</el-descriptions-item>
<el-descriptions-item></el-descriptions-item>
<el-descriptions-item label="家庭主要成员" :span="3">
<el-table v-if="viewData.families&&viewData.families.length"
:data="viewData.families" size="mini" border
:header-cell-style="{background:'#eff3f6'}"
style="width: 100%">
<el-table-column prop="relation" label="与本人关系" align="center" header-align="center">
</el-table-column>
<el-table-column prop="name" label="姓名" align="center" header-align="center">
</el-table-column>
<el-table-column prop="unit" label="单位" align="center" header-align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center" header-align="center">
</el-table-column>
</el-table>
<el-empty v-else :image-size="50" description="暂无家庭成员信息"></el-empty>
</el-descriptions-item>
<template v-if="viewData.loginname === storageUser.loginname">
<el-descriptions-item label="家庭主要成员" :span="3">
<el-table v-if="viewData.families&&viewData.families.length"
:data="viewData.families" size="mini" border
:header-cell-style="{background:'#eff3f6'}"
style="width: 100%">
<el-table-column prop="relation" label="与本人关系" align="center" header-align="center">
</el-table-column>
<el-table-column prop="name" label="姓名" align="center" header-align="center">
</el-table-column>
<el-table-column prop="unit" label="单位" align="center" header-align="center">
</el-table-column>
<el-table-column prop="remark" label="备注" align="center" header-align="center">
</el-table-column>
</el-table>
<el-empty v-else :image-size="50" description="暂无家庭成员信息"></el-empty>
</el-descriptions-item>
</template>
<el-descriptions-item label="个人简况" :span="3">
<template slot="label">个人简况</template>
<div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
@@ -64,7 +66,8 @@ const MEMBER_INFO = {
`,
data() {
return {
viewData: {}
viewData: {},
storageUser: {}
}
},
methods: {
@@ -76,5 +79,8 @@ const MEMBER_INFO = {
this.$message.warning(resp.msg)
}
}
},
created() {
this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
}
}
src/main/resources/views/platform/sourcechange/manage/userChangeInfo.js
+3
View File
@@ -464,6 +464,9 @@ const USER_CHANGE_INFO = {
this.$message.warning('请在数据更新后信息中设置该教工的【福利享受截止日期】')
return
}
if (this.formData.member === 1) {
this.$set(this.formData, "welfareMember", 1)
}
this.$confirm("提交后会改变人员基础数据，您确定要提交吗？", "提示", { type: "warning" })
.then(() => {
this.$emit('do-submit', this.formData)