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

姓名/工号查询

Browse Source
This commit is contained in:
=
2025-10-13 11:27:33 +08:00
parent a451975ebd
commit 0e12c436a7
27 changed files with 174 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java
+8 -4
View File
@@ -24,6 +24,7 @@ import org.nutz.dao.Cnd;
import org.nutz.dao.Dao; import org.nutz.dao.Dao;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap; import org.nutz.lang.util.NutMap;
@@ -71,7 +72,7 @@ public class UnionReimburseCollectController {
@Param(value = "unionId") String unionId, @Param(value = "unionId") String unionId,
@Param(value = "unitId") String unitId, @Param(value = "unitId") String unitId,
@Param(value = "reimburseProject") String reimburseProject, @Param(value = "reimburseProject") String reimburseProject,
@Param(value = "userName") String userName) { @Param(value = "userName") String searchKeyword) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
info.*, info.*,
@@ -108,9 +109,12 @@ public class UnionReimburseCollectController {
// 报销项目查询条件 // 报销项目查询条件
cnd.andEX("info.reimburseProject", "=", reimburseProject); cnd.andEX("info.reimburseProject", "=", reimburseProject);
// 经办人姓名查询条件 // 姓名和工号查询条件
if (StrUtil.isNotBlank(userName)) { if (StrUtil.isNotBlank(searchKeyword)) {
cnd.and("info.userName", "like", "%" + userName + "%"); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", "%" + searchKeyword + "%");
seg.orLike("info.loginName", "%" + searchKeyword + "%");
cnd.and(seg);
} }
// 只查询流程实例状态为20的数据（已完成状态） // 只查询流程实例状态为20的数据（已完成状态）
src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java
+12 -8
View File
@@ -18,6 +18,7 @@ import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.aop.Aop; import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
@@ -61,11 +62,11 @@ public class UnionReimburseMineController {
@ApiOperation("分页查询") @ApiOperation("分页查询")
@SaCheckPermission(value = {"unionReimburse.mine", "h5.unionReimburse.mine"}, mode = SaMode.OR) @SaCheckPermission(value = {"unionReimburse.mine", "h5.unionReimburse.mine"}, mode = SaMode.OR)
public Result pageData(PageForm pageForm, public Result pageData(PageForm pageForm,
@Param(value = "year") Integer year, Integer year,
@Param(value = "unionId") String unionId, String unionId,
@Param(value = "unitId") String unitId, String unitId,
@Param(value = "reimburseProject") String reimburseProject, String reimburseProject,
@Param(value = "userName") String userName) { String searchKeyword) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
info.*, info.*,
@@ -102,9 +103,12 @@ public class UnionReimburseMineController {
// 报销项目查询条件 // 报销项目查询条件
cnd.andEX("info.reimburseProject", "=", reimburseProject); cnd.andEX("info.reimburseProject", "=", reimburseProject);
// 经办人姓名查询条件 // 姓名和工号查询条件
if (StrUtil.isNotBlank(userName)) { if (StrUtil.isNotBlank(searchKeyword)) {
cnd.and("info.userName", "like", "%" + userName + "%"); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", "%" + searchKeyword + "%");
seg.orLike("info.loginName", "%" + searchKeyword + "%");
cnd.and(seg);
} }
cnd.desc("info.createTime"); cnd.desc("info.createTime");
cnd.and("info.userId", "=", SecurityUtil.getUserId()); cnd.and("info.userId", "=", SecurityUtil.getUserId());
src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseReviewController.java
+8 -4
View File
@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap; import org.nutz.lang.util.NutMap;
@@ -57,7 +58,7 @@ public class UnionReimburseReviewController {
String unionId, String unionId,
String unitId, String unitId,
String reimburseProject, String reimburseProject,
String userName) { String searchKeyword) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
info.*, info.*,
@@ -106,9 +107,12 @@ public class UnionReimburseReviewController {
cnd.andEX("info.reimburseProject", "=", reimburseProject); cnd.andEX("info.reimburseProject", "=", reimburseProject);
// 经办人姓名查询条件 // 姓名和工号查询条件
if (StrUtil.isNotBlank(userName)) { if (StrUtil.isNotBlank(searchKeyword)) {
cnd.and("info.userName", "like", "%" + userName + "%"); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", "%" + searchKeyword + "%");
seg.orLike("info.loginName", "%" + searchKeyword + "%");
cnd.and(seg);
} }
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("info.createTime"); cnd.desc("info.createTime");
src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxCollectController.java
+8 -4
View File
@@ -23,6 +23,7 @@ import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.aop.Aop; import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
@@ -70,7 +71,7 @@ public class DsznfmtxCollectController {
Integer year, Integer year,
String unionId, String unionId,
String unitId, String unitId,
String userName, String searchKeyword,
String sex) { String sex) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
@@ -109,9 +110,12 @@ public class DsznfmtxCollectController {
// 性别查询条件 // 性别查询条件
cnd.andEX("info.sex", "=", sex); cnd.andEX("info.sex", "=", sex);
// 姓名查询条件 // 姓名和工号查询条件
if (StrUtil.isNotBlank(userName)) { if (StrUtil.isNotBlank(searchKeyword)) {
cnd.and("info.userName", "like", "%" + userName + "%"); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", "%" + searchKeyword + "%");
seg.orLike("info.loginName", "%" + searchKeyword + "%");
cnd.and(seg);
} }
// 只查询流程实例状态为20的数据（已完成状态） // 只查询流程实例状态为20的数据（已完成状态）
src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxSchoolAuditController.java
+8 -4
View File
@@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap; import org.nutz.lang.util.NutMap;
@@ -59,7 +60,7 @@ public class DsznfmtxSchoolAuditController {
Integer year, Integer year,
String unionId, String unionId,
String unitId, String unitId,
String userName, String searchKeyword,
String sex) { String sex) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
@@ -108,9 +109,12 @@ public class DsznfmtxSchoolAuditController {
// 性别查询条件 // 性别查询条件
cnd.andEX("info.sex", "=", sex); cnd.andEX("info.sex", "=", sex);
// 姓名查询条件 // 姓名和工号查询条件
if (StrUtil.isNotBlank(userName)) { if (StrUtil.isNotBlank(searchKeyword)) {
cnd.and("info.userName", "like", "%" + userName + "%"); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", "%" + searchKeyword + "%");
seg.orLike("info.loginName", "%" + searchKeyword + "%");
cnd.and(seg);
} }
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("info.applyTime"); cnd.desc("info.applyTime");
src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxUnionAuditController.java
+8 -4
View File
@@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap; import org.nutz.lang.util.NutMap;
@@ -59,7 +60,7 @@ public class DsznfmtxUnionAuditController {
Integer year, Integer year,
String unionId, String unionId,
String unitId, String unitId,
String userName, String searchKeyword,
String sex) { String sex) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
@@ -108,9 +109,12 @@ public class DsznfmtxUnionAuditController {
// 性别查询条件 // 性别查询条件
cnd.andEX("info.sex", "=", sex); cnd.andEX("info.sex", "=", sex);
// 姓名查询条件 // 姓名和工号查询条件
if (StrUtil.isNotBlank(userName)) { if (StrUtil.isNotBlank(searchKeyword)) {
cnd.and("info.userName", "like", "%" + userName + "%"); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", "%" + searchKeyword + "%");
seg.orLike("info.loginName", "%" + searchKeyword + "%");
cnd.and(seg);
} }
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("info.applyTime"); cnd.desc("info.applyTime");
src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveCollectController.java
+8 -4
View File
@@ -24,6 +24,7 @@ import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.aop.Aop; import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
@@ -71,7 +72,7 @@ public class MaternityLeaveCollectController {
Integer year, Integer year,
String unionId, String unionId,
String unitId, String unitId,
String userName, String searchKeyword,
String sex) { String sex) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
@@ -110,9 +111,12 @@ public class MaternityLeaveCollectController {
// 性别查询条件 // 性别查询条件
cnd.andEX("info.sex", "=", sex); cnd.andEX("info.sex", "=", sex);
// 姓名查询条件 // 姓名和工号查询条件
if (StrUtil.isNotBlank(userName)) { if (StrUtil.isNotBlank(searchKeyword)) {
cnd.and("info.userName", "like", "%" + userName + "%"); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", "%" + searchKeyword + "%");
seg.orLike("info.loginName", "%" + searchKeyword + "%");
cnd.and(seg);
} }
// 只查询流程实例状态为20的数据（已完成状态） // 只查询流程实例状态为20的数据（已完成状态）
src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveSchoolAuditController.java
+8 -4
View File
@@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap; import org.nutz.lang.util.NutMap;
@@ -59,7 +60,7 @@ public class MaternityLeaveSchoolAuditController {
Integer year, Integer year,
String unionId, String unionId,
String unitId, String unitId,
String userName, String searchKeyword,
String sex) { String sex) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
@@ -108,9 +109,12 @@ public class MaternityLeaveSchoolAuditController {
// 性别查询条件 // 性别查询条件
cnd.andEX("info.sex", "=", sex); cnd.andEX("info.sex", "=", sex);
// 姓名查询条件 // 姓名和工号查询条件
if (StrUtil.isNotBlank(userName)) { if (StrUtil.isNotBlank(searchKeyword)) {
cnd.and("info.userName", "like", "%" + userName + "%"); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", "%" + searchKeyword + "%");
seg.orLike("info.loginName", "%" + searchKeyword + "%");
cnd.and(seg);
} }
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("info.applyTime"); cnd.desc("info.applyTime");
src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveUnionAuditController.java
+8 -4
View File
@@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
import org.nutz.lang.util.NutMap; import org.nutz.lang.util.NutMap;
@@ -59,7 +60,7 @@ public class MaternityLeaveUnionAuditController {
Integer year, Integer year,
String unionId, String unionId,
String unitId, String unitId,
String userName, String searchKeyword,
String sex) { String sex) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
@@ -108,9 +109,12 @@ public class MaternityLeaveUnionAuditController {
// 性别查询条件 // 性别查询条件
cnd.andEX("info.sex", "=", sex); cnd.andEX("info.sex", "=", sex);
// 姓名查询条件 // 姓名和工号查询条件
if (StrUtil.isNotBlank(userName)) { if (StrUtil.isNotBlank(searchKeyword)) {
cnd.and("info.userName", "like", "%" + userName + "%"); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", "%" + searchKeyword + "%");
seg.orLike("info.loginName", "%" + searchKeyword + "%");
cnd.and(seg);
} }
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("info.applyTime"); cnd.desc("info.applyTime");
src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceCollectController.java
+8 -4
View File
@@ -24,6 +24,7 @@ import org.nutz.aop.interceptor.ioc.TransAop;
import org.nutz.dao.Cnd; import org.nutz.dao.Cnd;
import org.nutz.dao.Sqls; import org.nutz.dao.Sqls;
import org.nutz.dao.sql.Sql; import org.nutz.dao.sql.Sql;
import org.nutz.dao.util.cri.SqlExpressionGroup;
import org.nutz.ioc.aop.Aop; import org.nutz.ioc.aop.Aop;
import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.Inject;
import org.nutz.ioc.loader.annotation.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
@@ -71,7 +72,7 @@ public class MutualInsuranceCollectController {
String projectId, String projectId,
String unionId, String unionId,
String unitId, String unitId,
String userName, String searchKeyword,
String sex) { String sex) {
Sql sql = Sqls.create(""" Sql sql = Sqls.create("""
SELECT SELECT
@@ -113,9 +114,12 @@ public class MutualInsuranceCollectController {
// 性别查询条件 // 性别查询条件
cnd.andEX("info.sex", "=", sex); cnd.andEX("info.sex", "=", sex);
// 姓名查询条件 // 姓名和工号查询条件
if (StrUtil.isNotBlank(userName)) { if (StrUtil.isNotBlank(searchKeyword)) {
cnd.and("info.userName", "like", "%" + userName + "%"); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", "%" + searchKeyword + "%");
seg.orLike("info.loginName", "%" + searchKeyword + "%");
cnd.and(seg);
} }
// 只查询流程实例状态为20的数据（已完成状态） // 只查询流程实例状态为20的数据（已完成状态）
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html
+6 -6
View File
@@ -25,8 +25,8 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="姓名"> <search-item label="姓名/工号">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input> <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input>
</search-item> </search-item>
<search-item label="性别"> <search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%"> <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -34,9 +34,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="工会名称"> <search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -44,9 +44,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html
+6 -6
View File
@@ -24,8 +24,8 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="姓名"> <search-item label="姓名/工号">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input> <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.userName" @keyup.enter.native="doSearch"></el-input>
</search-item> </search-item>
<search-item label="性别"> <search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%"> <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -33,9 +33,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="工会名称"> <search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -43,9 +43,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/collect/index.html
+7 -46
View File
@@ -9,9 +9,12 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="工会名称"> <search-item label="姓名/工号">
<el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -19,9 +22,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -39,26 +42,6 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="经办人">
<el-select
style="width: 100%"
v-model="pageForm.userName"
filterable
clearable
remote
reserve-keyword
placeholder="请输入经办人姓名或工号查询"
:remote-method="createRemoteMethod(userOptions)"
@change="userChange">
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
</el-option>
</el-select>
</search-item>
</search> </search>
</el-card> </el-card>
<el-card shadow="never"> <el-card shadow="never">
@@ -129,32 +112,10 @@ layout("/layouts/platform.html"){
pageDataUrl: "/platform/unionReimburse/collect/pageData", pageDataUrl: "/platform/unionReimburse/collect/pageData",
unionOptions: [], unionOptions: [],
unitOptions: [], unitOptions: [],
userOptions: [],
} }
} }
, ,
methods: { methods: {
//查询经办人
createRemoteMethod(options) {
return (keyword) => {
this.selectQueryUser(keyword, options)
}
},
selectQueryUser(keyword, options) {
options.length = 0
this.$axios.post("/platform/UnionReimburse/apply/listUser", {keyword: keyword}).then((res) => {
if (res.code === 0) {
options.push(...res.data)
}
})
},
userChange(val) {
const user = this.userOptions.find(o => o.id === val)
if (user) {
const { userName } = user
this.$set(this.pageForm, "userName", userName)
}
},
onView(row) { onView(row) {
this.$refs.guava.edit(()=>{ this.$refs.guava.edit(()=>{
this.showApprovalForm = false this.showApprovalForm = false
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html
+7 -47
View File
@@ -9,9 +9,12 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="工会名称"> <search-item label="姓名/工号">
<el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -19,9 +22,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -39,26 +42,6 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="经办人">
<el-select
style="width: 100%"
v-model="pageForm.userName"
filterable
clearable
remote
reserve-keyword
placeholder="请输入经办人姓名或工号查询"
:remote-method="createRemoteMethod(userOptions)"
@change="userChange">
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
</el-option>
</el-select>
</search-item>
</search> </search>
</el-card> </el-card>
<el-card shadow="never"> <el-card shadow="never">
@@ -129,33 +112,10 @@ layout("/layouts/platform.html"){
pageDataUrl: "/platform/unionReimburse/mine/pageData", pageDataUrl: "/platform/unionReimburse/mine/pageData",
unionOptions: [], unionOptions: [],
unitOptions: [], unitOptions: [],
userOptions: [],
} }
} }
, ,
methods: { methods: {
//查询经办人
createRemoteMethod(options) {
return (keyword) => {
this.selectQueryUser(keyword, options)
}
},
selectQueryUser(keyword, options) {
options.length = 0
this.$axios.post("/platform/UnionReimburse/apply/listUser", {keyword: keyword}).then((res) => {
if (res.code === 0) {
options.push(...res.data)
}
})
},
userChange(val) {
const user = this.userOptions.find(o => o.id === val)
if (user) {
const { userName } = user
this.$set(this.pageForm, "userName", userName)
}
},
onView(row) { onView(row) {
this.$refs.guava.view(()=>{ this.$refs.guava.view(()=>{
this.$refs.unionReimburseInfoRef.onOpen(row) this.$refs.unionReimburseInfoRef.onOpen(row)
src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html
+7 -47
View File
@@ -9,9 +9,12 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="工会名称"> <search-item label="姓名/工号">
<el-input placeholder="请输入经办人姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item>
<search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -19,9 +22,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -39,26 +42,6 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="经办人">
<el-select
style="width: 100%"
v-model="pageForm.userName"
filterable
clearable
remote
reserve-keyword
placeholder="请输入经办人姓名或工号查询"
:remote-method="createRemoteMethod(userOptions)"
@change="userChange">
<el-option
v-for="item in userOptions"
:key="item.id"
:label="item.userName+'（'+item.loginName+'）'+'（'+item.unitName+'）'+'（'+item.sex+'）'"
:value="item.id">
</el-option>
</el-select>
</search-item>
</search> </search>
</el-card> </el-card>
<el-card shadow="never"> <el-card shadow="never">
@@ -158,33 +141,10 @@ layout("/layouts/platform.html"){
showApprovalForm: false, showApprovalForm: false,
unionOptions: [], unionOptions: [],
unitOptions: [], unitOptions: [],
userOptions: [],
} }
} }
, ,
methods: { methods: {
//查询经办人
createRemoteMethod(options) {
return (keyword) => {
this.selectQueryUser(keyword, options)
}
},
selectQueryUser(keyword, options) {
options.length = 0
this.$axios.post("/platform/UnionReimburse/apply/listUser", {keyword: keyword}).then((res) => {
if (res.code === 0) {
options.push(...res.data)
}
})
},
userChange(val) {
const user = this.userOptions.find(o => o.id === val)
if (user) {
const { userName } = user
this.$set(this.pageForm, "userName", userName)
}
},
onView(row) { onView(row) {
this.$refs.guava.edit(()=>{ this.$refs.guava.edit(()=>{
this.showApprovalForm = false this.showApprovalForm = false
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html
+1
View File
@@ -347,6 +347,7 @@ layout("/layouts/platform.html"){
if (this.bizId) { if (this.bizId) {
this.findOne(this.bizId).then(async data => { this.findOne(this.bizId).then(async data => {
this.formData = data this.formData = data
console( data)
}) })
} else { } else {
const {id, username, loginname, union, unit, sex, birthday} = this.$store.state.user const {id, username, loginname, union, unit, sex, birthday} = this.$store.state.user
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/collect/index.html
+7 -7
View File
@@ -9,8 +9,8 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名"> <search-item label="姓名/工号">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName"></el-input> <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="性别"> <search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%"> <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="工会名称"> <search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -46,6 +46,7 @@ layout("/layouts/platform.html"){
</table-tool> </table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="userName" label="职工姓名"></el-table-column> <el-table-column prop="userName" label="职工姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column> <el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
@@ -53,7 +54,6 @@ layout("/layouts/platform.html"){
<el-table-column prop="retireTime" label="退休时间"></el-table-column> <el-table-column prop="retireTime" label="退休时间"></el-table-column>
<el-table-column prop="bonus" label="奖励金额"></el-table-column> <el-table-column prop="bonus" label="奖励金额"></el-table-column>
<el-table-column prop="applyTime" label="申请时间"></el-table-column> <el-table-column prop="applyTime" label="申请时间"></el-table-column>
<el-table-column prop="taskName" label="当前节点"></el-table-column>·
<el-table-column prop="instanceState" label="流程状态"> <el-table-column prop="instanceState" label="流程状态">
<template slot-scope="{row}"> <template slot-scope="{row}">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/mine/index.html
+1
View File
@@ -15,6 +15,7 @@ layout("/layouts/platform.html"){
<table-tool></table-tool> <table-tool></table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="userName" label="职工姓名"></el-table-column> <el-table-column prop="userName" label="职工姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column> <el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html
+7 -6
View File
@@ -9,8 +9,8 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名"> <search-item label="姓名/工号">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName"></el-input> <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="性别"> <search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%"> <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="工会名称"> <search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -49,6 +49,7 @@ layout("/layouts/platform.html"){
</table-tool> </table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="userName" label="职工姓名"></el-table-column> <el-table-column prop="userName" label="职工姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column> <el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html
+7 -6
View File
@@ -9,8 +9,8 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名"> <search-item label="姓名/工号">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName"></el-input> <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="性别"> <search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%"> <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -19,9 +19,9 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])"> <template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])">
<search-item label="工会名称"> <search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -29,9 +29,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -50,6 +50,7 @@ layout("/layouts/platform.html"){
</table-tool> </table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="userName" label="职工姓名"></el-table-column> <el-table-column prop="userName" label="职工姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column> <el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/collect/index.html
+7 -7
View File
@@ -9,8 +9,8 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名"> <search-item label="姓名/工号">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName"></el-input> <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="性别"> <search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%"> <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="工会名称"> <search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -46,13 +46,13 @@ layout("/layouts/platform.html"){
</table-tool> </table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="userName" label="职工姓名"></el-table-column> <el-table-column prop="userName" label="职工姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column> <el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
<el-table-column prop="unitName" label="所属单位"></el-table-column> <el-table-column prop="unitName" label="所属单位"></el-table-column>
<el-table-column prop="leaveDays" label="休假天数"></el-table-column> <el-table-column prop="leaveDays" label="休假天数"></el-table-column>
<el-table-column prop="applyTime" label="申请时间"></el-table-column> <el-table-column prop="applyTime" label="申请时间"></el-table-column>
<el-table-column prop="taskName" label="当前节点"></el-table-column>·
<el-table-column prop="instanceState" label="流程状态"> <el-table-column prop="instanceState" label="流程状态">
<template slot-scope="{row}"> <template slot-scope="{row}">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/mine/index.html
+1
View File
@@ -15,6 +15,7 @@ layout("/layouts/platform.html"){
<table-tool></table-tool> <table-tool></table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="userName" label="职工姓名"></el-table-column> <el-table-column prop="userName" label="职工姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column> <el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html
+7 -6
View File
@@ -9,8 +9,8 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名"> <search-item label="姓名/工号">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName"></el-input> <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="性别"> <search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%"> <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -18,9 +18,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="工会名称"> <search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -28,9 +28,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -49,6 +49,7 @@ layout("/layouts/platform.html"){
</table-tool> </table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="userName" label="职工姓名"></el-table-column> <el-table-column prop="userName" label="职工姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column> <el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html
+7 -6
View File
@@ -9,8 +9,8 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="年度"
style="width: 100%"></el-date-picker> style="width: 100%"></el-date-picker>
</search-item> </search-item>
<search-item label="姓名"> <search-item label="姓名/工号">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName"></el-input> <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="性别"> <search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%"> <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -19,9 +19,9 @@ layout("/layouts/platform.html"){
</el-select> </el-select>
</search-item> </search-item>
<template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])"> <template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])">
<search-item label="工会名称"> <search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -29,9 +29,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -50,6 +50,7 @@ layout("/layouts/platform.html"){
</table-tool> </table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="userName" label="职工姓名"></el-table-column> <el-table-column prop="userName" label="职工姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column> <el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="unionName" label="所属工会"></el-table-column> <el-table-column prop="unionName" label="所属工会"></el-table-column>
src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/collect/index.html
+7 -6
View File
@@ -23,8 +23,8 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="姓名"> <search-item label="姓名/工号">
<el-input placeholder="请输入姓名" clearable v-model="pageForm.userName"></el-input> <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"></el-input>
</search-item> </search-item>
<search-item label="性别"> <search-item label="性别">
<el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%"> <el-select v-model="pageForm.sex" placeholder="请选择性别" clearable style="width: 100%">
@@ -32,9 +32,9 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="工会名称"> <search-item label="分工会">
<el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
placeholder="请选择工会名称" clearable> placeholder="请选择分工会" clearable>
<el-option v-for="item in unionOptions" <el-option v-for="item in unionOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -42,9 +42,9 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="单位名称"> <search-item label="单位">
<el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%" <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
placeholder="请选择单位名称" clearable> placeholder="请选择单位" clearable>
<el-option v-for="item in unitOptions" <el-option v-for="item in unitOptions"
:value="item.id" :value="item.id"
:key="item.id" :key="item.id"
@@ -60,6 +60,7 @@ layout("/layouts/platform.html"){
</table-tool> </table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="userName" label="职工姓名"></el-table-column> <el-table-column prop="userName" label="职工姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column> <el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="age" label="年龄"></el-table-column> <el-table-column prop="age" label="年龄"></el-table-column>
src/main/resources/views/platform/zhgh/staffbenefit/mutualInsurance/mine/index.html
+1
View File
@@ -15,6 +15,7 @@ layout("/layouts/platform.html"){
<table-tool></table-tool> <table-tool></table-tool>
<el-table :data="tableData" @sort-change="pageOrder" style="width: 100%"> <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
<el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column> <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
<el-table-column prop="loginName" label="工号"></el-table-column>
<el-table-column prop="userName" label="职工姓名"></el-table-column> <el-table-column prop="userName" label="职工姓名"></el-table-column>
<el-table-column prop="sex" label="性别"></el-table-column> <el-table-column prop="sex" label="性别"></el-table-column>
<el-table-column prop="age" label="年龄"></el-table-column> <el-table-column prop="age" label="年龄"></el-table-column>
src/main/resources/views/platform/zhgh/staffmanage/childManage/manage/index.html
+4 -4
View File
@@ -25,7 +25,7 @@ layout("/layouts/platform.html"){
v-for="item in dict.type.CHILD_MANAGE_GRADE"></el-option> v-for="item in dict.type.CHILD_MANAGE_GRADE"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="模糊查询"> <search-item label="姓名">
<el-input @keyup.enter.native="doSearch" clearable <el-input @keyup.enter.native="doSearch" clearable
placeholder="请输入内容" placeholder="请输入内容"
v-model="pageForm.searchKeyword"> v-model="pageForm.searchKeyword">
@@ -45,15 +45,15 @@ layout("/layouts/platform.html"){
<el-option label="女" value="女"></el-option> <el-option label="女" value="女"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属工会"> <search-item label="分工会">
<el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%" <el-select v-model="pageForm.unionId" placeholder="请选择分工会" clearable style="width: 100%"
@change="flushUnits" @clear="flushUnits"> @change="flushUnits" @clear="flushUnits">
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" <el-option v-for="item in unionOptions" :key="item.id" :label="item.name"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位"> <search-item label="单位">
<el-select placeholder="所属单位" style="width: 100%" v-model="pageForm.unitId" clearable <el-select placeholder="请选择单位" style="width: 100%" v-model="pageForm.unitId" clearable
filterable> filterable>
<el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unitOptions" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>