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

commit

Browse Source
This commit is contained in:
Paidax
2025-09-05 14:06:35 +08:00
parent 1356481af2
commit b2ee7f9008
8 changed files with 82 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/v/nutz/zhgh/data/service/impl/SourceUserServiceImpl.java
+1 -1
View File
@@ -537,7 +537,7 @@ public class SourceUserServiceImpl extends ViServiceImpl<UserSource> implements
} }
if (List.of("education", "campus", "academicDegree").contains(fieldName)) { if (List.of("education", "campus", "academicDegree").contains(fieldName)) {
if (StrUtil.isBlank(sourceMap.getString(fieldName, "")) && StrUtil.isNotBlank(newMap.getString(fieldName, ""))) { if (StrUtil.isNotBlank(sourceMap.getString(fieldName, "")) && StrUtil.isBlank(newMap.getString(fieldName, ""))) {
continue; continue;
} }
} }
src/main/resources/logback.xml
+1 -1
View File
@@ -10,7 +10,7 @@
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"> <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="org.nutz.boot.starter.logback.exts.logfile.LogfileTimeBasedRollingPolicy"> <rollingPolicy class="org.nutz.boot.starter.logback.exts.logfile.LogfileTimeBasedRollingPolicy">
<fileNamePattern>/app/logs/mini-%d{yyyy-MM-dd}.log</fileNamePattern> <fileNamePattern>/app/logs/mini-%d{yyyy-MM-dd}.log</fileNamePattern>
<maxHistory>15</maxHistory> <maxHistory>180</maxHistory>
</rollingPolicy> </rollingPolicy>
<encoder> <encoder>
<pattern>[%-5level] %d{HH:mm:ss.SSS} %logger - %msg%n</pattern> <pattern>[%-5level] %d{HH:mm:ss.SSS} %logger - %msg%n</pattern>
src/main/resources/views/mobile/member/apply/common/memberApplyAuditInfo.js
+36 -29
View File
@@ -44,34 +44,36 @@ const MEMBER_APPLY_AUDIT_INFO = {
<!-- <van-cell title="会员状态">{{ viewData.member ? '会员' : '非会员' }}</van-cell>--> <!-- <van-cell title="会员状态">{{ viewData.member ? '会员' : '非会员' }}</van-cell>-->
<!-- <van-cell title="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</van-cell>--> <!-- <van-cell title="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</van-cell>-->
<van-cell title="家庭成员" class="column-cell"> <template v-if="viewData.loginname === storageUser.loginname">
<table class="family-table"> <van-cell title="家庭成员" class="column-cell">
<thead> <table class="family-table">
<tr> <thead>
<th class="table-header">序号</th> <tr>
<th class="table-header">与本人关系</th> <th class="table-header">序号</th>
<th class="table-header">姓名</th> <th class="table-header">与本人关系</th>
<th class="table-header">单位</th> <th class="table-header">姓名</th>
<th class="table-header">备注</th> <th class="table-header">单位</th>
</tr> <th class="table-header">备注</th>
</thead> </tr>
<tbody> </thead>
<tr class="table-row" v-for="(item, index) in viewData.families" :key="index"> <tbody>
<td class="table-cell">{{ index + 1 }}</td> <tr class="table-row" v-for="(item, index) in viewData.families" :key="index">
<td class="table-cell">{{ item.relation }}</td> <td class="table-cell">{{ index + 1 }}</td>
<td class="table-cell">{{ item.name }}</td> <td class="table-cell">{{ item.relation }}</td>
<td class="table-cell">{{ item.unit }}</td> <td class="table-cell">{{ item.name }}</td>
<td class="table-cell">{{ item.remark }}</td> <td class="table-cell">{{ item.unit }}</td>
</tr> <td class="table-cell">{{ item.remark }}</td>
</tbody> </tr>
</table> </tbody>
</van-cell> </table>
<van-cell title="个人简历"> </van-cell>
<template #label> <van-cell title="个人简历">
<div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div> <template #label>
<span style="font-size: 14px" v-else>无数据</span> <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
</template> <span style="font-size: 14px" v-else>无数据</span>
</van-cell> </template>
</van-cell>
</template>
<van-cell title="签字"> <van-cell title="签字">
<template #label> <template #label>
@@ -111,7 +113,9 @@ const MEMBER_APPLY_AUDIT_INFO = {
branchAudit: {} branchAudit: {}
}, },
clickUpOrDown: true clickUpOrDown: true,
storageUser: {}
} }
}, },
methods:{ methods:{
@@ -128,6 +132,9 @@ const MEMBER_APPLY_AUDIT_INFO = {
} }
} }
}, },
created(){
this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
},
style: /*language=CSS*/ style: /*language=CSS*/
` `
.column-cell { .column-cell {
src/main/resources/views/mobile/member/change/branchUnionAudit/index.html
+1 -1
View File
@@ -46,7 +46,7 @@ layout("/mobile/platform.html"){
<div id="app" v-cloak> <div id="app" v-cloak>
<van-nav-bar title="会员变更分工会审核" left-arrow placeholder fixed <van-nav-bar title="会员变更分工会审核" left-arrow placeholder fixed
@click-left="history.back()"></van-nav-bar> @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
<div class="search-fixed"> <div class="search-fixed">
<van-search <van-search
src/main/resources/views/mobile/member/change/common/memberChangeInfo.js
+9 -5
View File
@@ -24,10 +24,12 @@ const MEMBER_CHANGE_INFO = {
<van-cell title="人员性质" :value="viewData.preparedBy" /> <van-cell title="人员性质" :value="viewData.preparedBy" />
<van-cell title="会员状态" :value="viewData.member ? '会员' : '非会员'" /> <van-cell title="会员状态" :value="viewData.member ? '会员' : '非会员'" />
<van-cell title="福利会员状态" :value="viewData.welfareMember ? '福利会员' : '非福利会员'" /> <van-cell title="福利会员状态" :value="viewData.welfareMember ? '福利会员' : '非福利会员'" />
<van-cell title="个人简况"> <template v-if="viewData.loginname === storageUser.loginname">
<div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div> <van-cell title="个人简况">
<span v-else>无数据</span> <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
</van-cell> <span v-else>无数据</span>
</van-cell>
</template>
</van-cell-group> </van-cell-group>
</van-tab> </van-tab>
<van-tab title="变更信息" class="mb10"> <van-tab title="变更信息" class="mb10">
@@ -85,6 +87,8 @@ const MEMBER_CHANGE_INFO = {
schoolAudit: {}, schoolAudit: {},
branchAudit: {} branchAudit: {}
}, },
storageUser: {}
} }
}, },
methods: { methods: {
@@ -99,7 +103,7 @@ const MEMBER_CHANGE_INFO = {
}, },
}, },
async created() { async created() {
this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
}, },
style: /*language=CSS*/` style: /*language=CSS*/`
.change_info .van-empty { .change_info .van-empty {
src/main/resources/views/mobile/member/change/mine/index.html
+1 -1
View File
@@ -46,7 +46,7 @@ layout("/mobile/platform.html"){
<div id="app" v-cloak> <div id="app" v-cloak>
<van-nav-bar title="我的变更申请" left-arrow placeholder fixed <van-nav-bar title="我的变更申请" left-arrow placeholder fixed
@click-left="history.back()"></van-nav-bar> @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
<div class="search-fixed"> <div class="search-fixed">
<van-search <van-search
src/main/resources/views/mobile/member/change/schoolUnionAudit/index.html
+1 -1
View File
@@ -46,7 +46,7 @@ layout("/mobile/platform.html"){
<div id="app" v-cloak> <div id="app" v-cloak>
<van-nav-bar title="会员变更校工会审核" left-arrow placeholder fixed <van-nav-bar title="会员变更校工会审核" left-arrow placeholder fixed
@click-left="history.back()"></van-nav-bar> @click-left="pjaxReplace('/mobile/index')"></van-nav-bar>
<div class="search-fixed"> <div class="search-fixed">
<van-search <van-search
src/main/resources/views/mobile/member/common/memberInfoH5.js
+32 -28
View File
@@ -29,38 +29,42 @@ const MEMBER_INFO_H5 = {
<van-cell title="会员状态">{{ viewData.member ? '会员' : '非会员' }}</van-cell> <van-cell title="会员状态">{{ viewData.member ? '会员' : '非会员' }}</van-cell>
<van-cell title="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</van-cell> <van-cell title="福利会员状态">{{ viewData.welfareMember ? '福利会员' : '非福利会员' }}</van-cell>
<van-cell title="家庭成员收入" class="column-cell"> <template v-if="viewData.loginname === storageUser.loginname">
<table class="family-table"> <van-cell title="家庭成员收入" class="column-cell">
<thead> <table class="family-table">
<tr> <thead>
<th class="table-header">序号</th> <tr>
<th class="table-header">与本人关系</th> <th class="table-header">序号</th>
<th class="table-header">姓名</th> <th class="table-header">与本人关系</th>
<th class="table-header">单位</th> <th class="table-header">姓名</th>
<th class="table-header">备注</th> <th class="table-header">单位</th>
</tr> <th class="table-header">备注</th>
</thead> </tr>
<tbody> </thead>
<tr class="table-row" v-for="(item, index) in viewData.families" :key="index"> <tbody>
<td class="table-cell">{{ index + 1 }}</td> <tr class="table-row" v-for="(item, index) in viewData.families" :key="index">
<td class="table-cell">{{ item.name }}</td> <td class="table-cell">{{ index + 1 }}</td>
<td class="table-cell">{{ item.age }}</td> <td class="table-cell">{{ item.name }}</td>
<td class="table-cell">{{ item.relation }}</td> <td class="table-cell">{{ item.age }}</td>
<td class="table-cell">{{ item.monthlyIncome }}</td> <td class="table-cell">{{ item.relation }}</td>
</tr> <td class="table-cell">{{ item.monthlyIncome }}</td>
</tbody> </tr>
</table> </tbody>
</van-cell> </table>
<van-cell title="个人简历"> </van-cell>
<div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div> <van-cell title="个人简历">
<span v-else>无数据</span> <div v-if="viewData.vita" class="text-left" v-html="viewData.vita"></div>
</van-cell> <span v-else>无数据</span>
</van-cell>
</template>
</van-cell-group> </van-cell-group>
</div> </div>
`, `,
data(){ data(){
return{ return{
viewData: {} viewData: {},
storageUser: {}
} }
}, },
methods: { methods: {
@@ -76,6 +80,6 @@ const MEMBER_INFO_H5 = {
} }
}, },
created() { created() {
this.storageUser = JSON.parse(window.sessionStorage.getItem('user'))
} }
} }