..
This commit is contained in:
+1
@@ -153,6 +153,7 @@ public class MemberSchoolUnionManageController {
|
|||||||
exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
|
exportEntities.add(new ExcelExportEntity("性别", "sex", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("出生年月", "birthday", 20));
|
exportEntities.add(new ExcelExportEntity("出生年月", "birthday", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20));
|
exportEntities.add(new ExcelExportEntity("联系电话", "mobile", 20));
|
||||||
|
exportEntities.add(new ExcelExportEntity("福利号码", "welfareMobile", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
|
exportEntities.add(new ExcelExportEntity("在职状态", "userState", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("聘用方式", "preparedBy", 20));
|
exportEntities.add(new ExcelExportEntity("聘用方式", "preparedBy", 20));
|
||||||
exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20));
|
exportEntities.add(new ExcelExportEntity("人员类型", "personType", 20));
|
||||||
|
|||||||
+1
-1
@@ -76,7 +76,7 @@ public class MemberManageServiceImpl extends BaseServiceImpl<Sys_user> implement
|
|||||||
u.unitName,
|
u.unitName,
|
||||||
u.unionId,
|
u.unionId,
|
||||||
u.unionName,
|
u.unionName,
|
||||||
u.birthday,
|
DATE_FORMAT(u.birthday, '%Y-%m-%d ') as birthday,
|
||||||
u.manyUnit,
|
u.manyUnit,
|
||||||
u.member,
|
u.member,
|
||||||
u.userState,
|
u.userState,
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
$moment(viewData.retireDate).format('YYYY-MM-DD') : null }}
|
$moment(viewData.retireDate).format('YYYY-MM-DD') : null }}
|
||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item>
|
<el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item>
|
||||||
|
<el-descriptions-item label="福利号码">{{ viewData.welfareMobile }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
|
<el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
|
|
||||||
@@ -35,7 +36,6 @@
|
|||||||
</el-descriptions-item>
|
</el-descriptions-item>
|
||||||
<el-descriptions-item label="所属单位">{{ viewData.unitName }}</el-descriptions-item>
|
<el-descriptions-item label="所属单位">{{ viewData.unitName }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="所属分工会">{{ viewData.unionName }}</el-descriptions-item>
|
<el-descriptions-item label="所属分工会">{{ viewData.unionName }}</el-descriptions-item>
|
||||||
<el-descriptions-item label="福利号码">{{ viewData.welfareMobile }}</el-descriptions-item>
|
|
||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
|
|
||||||
<div class="process-title">学历信息</div>
|
<div class="process-title">学历信息</div>
|
||||||
|
|||||||
+1
-1
@@ -123,7 +123,7 @@ const MEMBER_MANAGE_TABLE = {
|
|||||||
</el-dropdown-item>
|
</el-dropdown-item>
|
||||||
<el-dropdown-item
|
<el-dropdown-item
|
||||||
:command="{type:'changeWelfareMobile',data:row}"
|
:command="{type:'changeWelfareMobile',data:row}"
|
||||||
v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN','BRANCH_UNION_CHAIRMAN','BRANCH_UNION_CHAIRMAN'])">
|
v-if="$auth.hasRoleOr(['SYSADMIN','SCHOOL_UNION_ADMIN'])">
|
||||||
修改福利号码
|
修改福利号码
|
||||||
</el-dropdown-item>
|
</el-dropdown-item>
|
||||||
|
|
||||||
|
|||||||
@@ -32,13 +32,6 @@ layout("/layouts/platform_h5.html"){
|
|||||||
<van-cell title="在职状态" :value="formData.userState" readonly></van-cell>
|
<van-cell title="在职状态" :value="formData.userState" readonly></van-cell>
|
||||||
<van-cell title="预计离退休时间" :value="formData.retireDate" readonly></van-cell>
|
<van-cell title="预计离退休时间" :value="formData.retireDate" readonly></van-cell>
|
||||||
<van-cell title="联系电话" :value="formData.mobile" readonly></van-cell>
|
<van-cell title="联系电话" :value="formData.mobile" readonly></van-cell>
|
||||||
<van-cell title="电子邮箱" :value="formData.email" readonly></van-cell>
|
|
||||||
</van-cell-group>
|
|
||||||
|
|
||||||
<van-cell-group title="会员信息">
|
|
||||||
<van-cell title="是否会员">{{formData.member === 1 ? '是' : '否'}}</van-cell>
|
|
||||||
<van-cell title="所属单位">{{ formData.unitName }}</van-cell>
|
|
||||||
<van-cell title="所属分工会">{{ formData.unionName }}</van-cell>
|
|
||||||
<van-cell title="福利号码">
|
<van-cell title="福利号码">
|
||||||
{{ formData.welfareMobile || '暂无' }}
|
{{ formData.welfareMobile || '暂无' }}
|
||||||
<span style="color: var(--color-primary)" @click="openWelfareMobile">
|
<span style="color: var(--color-primary)" @click="openWelfareMobile">
|
||||||
@@ -47,6 +40,13 @@ layout("/layouts/platform_h5.html"){
|
|||||||
</span>
|
</span>
|
||||||
<!-- <van-button type="primary" size="mini">修改</van-button>-->
|
<!-- <van-button type="primary" size="mini">修改</van-button>-->
|
||||||
</van-cell>
|
</van-cell>
|
||||||
|
<van-cell title="电子邮箱" :value="formData.email" readonly></van-cell>
|
||||||
|
</van-cell-group>
|
||||||
|
|
||||||
|
<van-cell-group title="会员信息">
|
||||||
|
<van-cell title="是否会员">{{formData.member === 1 ? '是' : '否'}}</van-cell>
|
||||||
|
<van-cell title="所属单位">{{ formData.unitName }}</van-cell>
|
||||||
|
<van-cell title="所属分工会">{{ formData.unionName }}</van-cell>
|
||||||
</van-cell-group>
|
</van-cell-group>
|
||||||
|
|
||||||
<van-cell-group title="学历信息">
|
<van-cell-group title="学历信息">
|
||||||
|
|||||||
@@ -339,7 +339,7 @@ public class JugTest {
|
|||||||
@Test
|
@Test
|
||||||
public void importWelfareMobile() {
|
public void importWelfareMobile() {
|
||||||
try {
|
try {
|
||||||
File file = new File("C:\\Users\\jug\\Desktop\\副本2025年南师大端午发放清单0915.xlsx");
|
File file = new File("C:\\Users\\administrator\\Desktop\\副本2025年南师大端午发放清单0915.xlsx");
|
||||||
ImportParams params = new ImportParams();
|
ImportParams params = new ImportParams();
|
||||||
|
|
||||||
List<User> list = ExcelImportUtil.importExcel(file, User.class, params);
|
List<User> list = ExcelImportUtil.importExcel(file, User.class, params);
|
||||||
|
|||||||
Reference in New Issue
Block a user