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

commit

Browse Source
This commit is contained in:
Paidax
2025-10-20 14:17:30 +08:00
parent 4434d7d243
commit 0209e4931d
48 changed files with 211 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/dayofficework/article/controller/ArticleAnalysisController.java
+1 -1
View File
@@ -70,7 +70,7 @@ public class ArticleAnalysisController {
// 获取活跃投稿人数 // 获取活跃投稿人数
DateTime dateTime = DateUtil.offsetMonth(new Date(), -1); DateTime dateTime = DateUtil.offsetMonth(new Date(), -1);
long activeUsers = articleService.count(Cnd.where("submitTime", ">=", dateTime).groupBy("userId")); long activeUsers = Math.max(articleService.count(Cnd.where("submitTime", ">=", dateTime).groupBy("userId")), 0L);
list.add(ArticleAnalysisOverviewVO.builder() list.add(ArticleAnalysisOverviewVO.builder()
.label("活跃投稿人") .label("活跃投稿人")
.value(activeUsers) .value(activeUsers)
src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateBranchUnionApprovalController.java
+6 -2
View File
@@ -17,6 +17,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.mvc.annotation.At; import org.nutz.mvc.annotation.At;
@@ -94,8 +95,11 @@ public class EvaluateBranchUnionApprovalController {
} else { } else {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
} }
if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageForm.getSearchKeyword());
seg.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(seg);
} }
cnd.andEX("YEAR(info.applyDateTime)", "=", pageForm.getYear()); cnd.andEX("YEAR(info.applyDateTime)", "=", pageForm.getYear());
cnd.groupBy("t.id"); cnd.groupBy("t.id");
src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/controller/EvaluateSchoolUnionApprovalController.java
+6 -2
View File
@@ -25,6 +25,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.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;
@@ -109,8 +110,11 @@ public class EvaluateSchoolUnionApprovalController {
} else { } else {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
} }
if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageForm.getSearchKeyword());
seg.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(seg);
} }
cnd.andEX("YEAR(info.applyDateTime)", "=", pageForm.getYear()); cnd.andEX("YEAR(info.applyDateTime)", "=", pageForm.getYear());
cnd.groupBy("t.id"); cnd.groupBy("t.id");
src/main/java/com/budwk/app/zhgh/dayofficework/evaluation/service/impl/EvaluateServiceImpl.java
+6 -2
View File
@@ -11,6 +11,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.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
@IocBean(args = {"refer:dao"}) @IocBean(args = {"refer:dao"})
@@ -60,8 +61,11 @@ public class EvaluateServiceImpl extends BaseServiceImpl<EvaluateApply> implemen
cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode()); cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode());
cnd.andEX("info.unitId", "=", pageForm.getUnitId()); cnd.andEX("info.unitId", "=", pageForm.getUnitId());
cnd.andEX("info.unionId", "=", pageForm.getUnionId()); cnd.andEX("info.unionId", "=", pageForm.getUnionId());
if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageForm.getSearchKeyword());
seg.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(seg);
} }
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("t.createdAt").desc("info.applyDateTime"); cnd.desc("t.createdAt").desc("info.applyDateTime");
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubAuditController.java
+6 -2
View File
@@ -24,6 +24,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;
@@ -114,8 +115,11 @@ public class OutlayReimburseClubAuditController {
} else { } else {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
} }
if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageForm.getSearchKeyword());
seg.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(seg);
} }
cnd.andEX("YEAR(info.applyTime)", "=", year); cnd.andEX("YEAR(info.applyTime)", "=", year);
cnd.groupBy("t.id"); cnd.groupBy("t.id");
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseClubZxAuditController.java
+6 -2
View File
@@ -17,6 +17,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;
@@ -101,8 +102,11 @@ public class OutlayReimburseClubZxAuditController {
} else { } else {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
} }
if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageForm.getSearchKeyword());
seg.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(seg);
} }
cnd.andEX("YEAR(info.applyTime)", "=", year); cnd.andEX("YEAR(info.applyTime)", "=", year);
cnd.groupBy("t.id"); cnd.groupBy("t.id");
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolCnAuditController.java
+6 -2
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;
@@ -98,8 +99,11 @@ public class OutlayReimburseSchoolCnAuditController {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
} }
if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageForm.getSearchKeyword());
seg.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(seg);
} }
cnd.groupBy("t.id"); cnd.groupBy("t.id");
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolKjAuditController.java
+6 -3
View File
@@ -20,6 +20,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;
@@ -107,11 +108,13 @@ public class OutlayReimburseSchoolKjAuditController {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
} }
if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageForm.getSearchKeyword());
seg.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(seg);
} }
cnd.groupBy("t.id"); cnd.groupBy("t.id");
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("t.createdAt").desc("info.applyTime"); cnd.desc("t.createdAt").desc("info.applyTime");
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseSchoolZxAuditController.java
+6 -3
View File
@@ -17,6 +17,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;
@@ -103,11 +104,13 @@ public class OutlayReimburseSchoolZxAuditController {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
} }
if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageForm.getSearchKeyword());
seg.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(seg);
} }
cnd.groupBy("t.id"); cnd.groupBy("t.id");
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("t.createdAt").desc("info.applyTime"); cnd.desc("t.createdAt").desc("info.applyTime");
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/controller/OutlayReimburseUnionAuditController.java
+6 -2
View File
@@ -17,6 +17,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;
@@ -103,8 +104,11 @@ public class OutlayReimburseUnionAuditController {
} else { } else {
cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode()); cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
} }
if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageForm.getSearchKeyword());
seg.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(seg);
} }
cnd.andEX("YEAR(info.applyTime)", "=", year); cnd.andEX("YEAR(info.applyTime)", "=", year);
cnd.groupBy("t.id"); cnd.groupBy("t.id");
src/main/java/com/budwk/app/zhgh/dayofficework/outlay/outlayReimburse/service/impl/OutlayReimburseSummaryServiceImpl.java
+6 -2
View File
@@ -10,6 +10,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.IocBean; import org.nutz.ioc.loader.annotation.IocBean;
/** /**
@@ -57,8 +58,11 @@ public class OutlayReimburseSummaryServiceImpl extends BaseServiceImpl implement
cnd.andEX("YEAR(info.applyTime)", "=", pageForm.getYear()); cnd.andEX("YEAR(info.applyTime)", "=", pageForm.getYear());
cnd.andEX("info.detailsTypeId", "=", pageForm.getDetailsTypeId()); cnd.andEX("info.detailsTypeId", "=", pageForm.getDetailsTypeId());
cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode()); cnd.and("ins.state", "=", ProcessTaskStateEnum.FINISHED.getCode());
if (StrUtil.isAllNotEmpty(pageForm.getSearchName(), pageForm.getSearchKeyword())) { if (StrUtil.isNotBlank(pageForm.getSearchKeyword())) {
cnd.where().andLike(pageForm.getSearchName(), pageForm.getSearchKeyword()); SqlExpressionGroup seg = new SqlExpressionGroup();
seg.orLike("info.userName", pageForm.getSearchKeyword());
seg.orLike("info.loginName", pageForm.getSearchKeyword());
cnd.and(seg);
} }
if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) {
cnd.desc("t.createdAt").desc("info.applyTime"); cnd.desc("t.createdAt").desc("info.applyTime");
src/main/resources/views/platform/zhgh/activity/planSummary/yearPlan/index.html
+1 -1
View File
@@ -30,7 +30,7 @@ layout("/layouts/platform.html"){
v-model="pageForm.planName" v-model="pageForm.planName"
></el-input> ></el-input>
</search-item> </search-item>
<search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('BRANCH_UNION_CHAIRMAN')" label="所属工会："> <search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('BRANCH_UNION_CHAIRMAN')" label="所属工会">
<el-select v-model="pageForm.tissueIdByUnion" placeholder="请选择所属工会" filterable clearable <el-select v-model="pageForm.tissueIdByUnion" placeholder="请选择所属工会" filterable clearable
@change="doSearch" style="width: 100%"> @change="doSearch" style="width: 100%">
<el-option <el-option
src/main/resources/views/platform/zhgh/activity/planSummary/yearSummary/index.html
+1 -1
View File
@@ -27,7 +27,7 @@ layout("/layouts/platform.html"){
<el-option v-for="item in dict.type.SUMMARY_TYPE" :label="item.name" :value="item.code" :key="item.code"></el-option> <el-option v-for="item in dict.type.SUMMARY_TYPE" :label="item.name" :value="item.code" :key="item.code"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('BRANCH_UNION_CHAIRMAN')" label="所属工会："> <search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('BRANCH_UNION_CHAIRMAN')" label="所属工会">
<el-select v-model="pageForm.tissueIdByUnion" placeholder="请选择所属工会" filterable clearable <el-select v-model="pageForm.tissueIdByUnion" placeholder="请选择所属工会" filterable clearable
@change="doSearch" style="width: 100%"> @change="doSearch" style="width: 100%">
<el-option <el-option
src/main/resources/views/platform/zhgh/dayofficework/article/firstExamine/index.html
+1 -1
View File
@@ -17,7 +17,7 @@ layout("/layouts/platform.html"){
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位："> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%"> <el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%">
<el-option v-for="item in unitOptions" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unitOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/article/query/index.html
+1 -1
View File
@@ -17,7 +17,7 @@ layout("/layouts/platform.html"){
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位："> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%"> <el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%">
<el-option v-for="item in unitOptions" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unitOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/clothing/account/index.html
+2 -2
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
placeholder="请选择年度" placeholder="请选择年度"
type="year" type="year"
@@ -32,7 +32,7 @@ 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.unionId" placeholder="请选择所属工会" filterable clearable <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
@change="doSearch" style="width: 100%"> @change="doSearch" style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
src/main/resources/views/platform/zhgh/dayofficework/clothing/record/index.html
+1 -1
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
placeholder="请选择年度" placeholder="请选择年度"
type="year" type="year"
src/main/resources/views/platform/zhgh/dayofficework/evaluation/apply/index.html
+1 -1
View File
@@ -7,7 +7,7 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<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>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/branchUnionApproval/index.html
+3 -10
View File
@@ -10,23 +10,16 @@ layout("/layouts/platform.html"){
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy"
placeholder="选择年度" @change="listEvaluate"></el-date-picker> placeholder="选择年度" @change="listEvaluate"></el-date-picker>
</search-item> </search-item>
<search-item label="事项："> <search-item label="事项">
<el-select v-model="pageForm.evaluateId" placeholder="请选择评优评先事项" filterable clearable <el-select v-model="pageForm.evaluateId" placeholder="请选择评优评先事项" filterable clearable
style="width: 100%"> style="width: 100%">
<el-option v-for="item in evaluateList" :key="item.id" :label="item.name" <el-option v-for="item in evaluateList" :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-input @keyup.enter.native="doSearch" clearable <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入姓名或工号"
placeholder="请输入内容"
v-model="pageForm.searchKeyword"> v-model="pageForm.searchKeyword">
<el-select placeholder="查询类型" slot="prepend"
style="width: 100px;"
v-model="pageForm.searchName">
<el-option label="姓名" value="info.userName"></el-option>
<el-option label="工号" value="info.loginName"></el-option>
</el-select>
</el-input> </el-input>
</search-item> </search-item>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/schoolUnionApproval/index.html
+7 -14
View File
@@ -9,31 +9,24 @@ layout("/layouts/platform.html"){
<search-item label="年度"> <search-item label="年度">
<el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="选择年度"@change="listEvaluate"></el-date-picker> <el-date-picker v-model="pageForm.year" type="year" value-format="yyyy" placeholder="选择年度"@change="listEvaluate"></el-date-picker>
</search-item> </search-item>
<search-item label="事项："> <search-item label="事项">
<el-select v-model="pageForm.evaluateId" placeholder="请选择评优评先事项" filterable clearable <el-select v-model="pageForm.evaluateId" placeholder="请选择评优评先事项" filterable clearable
style="width: 100%"> style="width: 100%">
<el-option v-for="item in evaluateList" :key="item.id" :label="item.name" <el-option v-for="item in evaluateList" :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-input @keyup.enter.native="doSearch" clearable <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入姓名或工号"
placeholder="请输入内容" v-model="pageForm.searchKeyword">
v-model="pageForm.searchKeyword"> </el-input>
<el-select placeholder="查询类型" slot="prepend"
style="width: 100px;"
v-model="pageForm.searchName">
<el-option label="姓名" value="info.userName"></el-option>
<el-option label="工号" value="info.loginName"></el-option>
</el-select>
</el-input>
</search-item> </search-item>
<search-item label="所属工会："> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%"> <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位："> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%"> <el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%">
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/dayofficework/evaluation/summary/index.html
+9 -16
View File
@@ -6,7 +6,7 @@ layout("/layouts/platform.html"){
<guava ref="guava"> <guava ref="guava">
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
placeholder="选择年度" placeholder="选择年度"
type="year" type="year"
@@ -16,34 +16,27 @@ layout("/layouts/platform.html"){
@change="listEvaluate()" @change="listEvaluate()"
></el-date-picker> ></el-date-picker>
</search-item> </search-item>
<search-item label="事项："> <search-item label="事项">
<el-select v-model="pageForm.evaluateId" placeholder="请选择评优评先事项" filterable clearable <el-select v-model="pageForm.evaluateId" placeholder="请选择评优评先事项" filterable clearable
style="width: 100%"> style="width: 100%">
<el-option v-for="item in evaluateList" :key="item.id" :label="item.name" <el-option v-for="item in evaluateList" :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-input @keyup.enter.native="doSearch" clearable <el-input @keyup.enter.native="doSearch" clearable placeholder="请输入姓名或工号"
placeholder="请输入内容" v-model="pageForm.searchKeyword">
v-model="pageForm.searchKeyword"> </el-input>
<el-select placeholder="查询类型" slot="prepend" </search-item>
style="width: 100px;"
v-model="pageForm.searchName">
<el-option label="姓名" value="info.userName"></el-option>
<el-option label="工号" value="info.loginName"></el-option>
</el-select>
</el-input>
</search-item>
<search-item label="所属工会："> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
style="width: 100%"> style="width: 100%">
<el-option v-for="item in unionList" :key="item.id" :label="item.name" <el-option v-for="item in unionList" :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 v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable <el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable
style="width: 100%"> style="width: 100%">
<el-option v-for="item in unitList" :key="item.id" :label="item.name" <el-option v-for="item in unitList" :key="item.id" :label="item.name"
src/main/resources/views/platform/zhgh/dayofficework/exerciseCard/apply/index.html
+18 -10
View File
@@ -25,39 +25,47 @@ layout("/layouts/platform.html"){
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="工号"> <el-descriptions-item label="工号">
<el-form-item prop="loginName"> <el-form-item prop="loginName">
<el-input v-model="formData.loginName" readonly size="small"></el-input> <el-input v-model="formData.loginName" readonly size="small" placeholder="请输入职工姓名后自动填充"></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="性别"> <el-descriptions-item label="性别">
<el-form-item prop="sex"> <el-form-item prop="sex">
<el-input v-model="formData.sex" readonly size="small"></el-input> <el-input v-model="formData.sex" readonly size="small" placeholder="请输入职工姓名后自动填充"></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="出生年月"> <el-descriptions-item label="出生年月">
<el-form-item prop="birthday"> <el-form-item prop="birthday">
<el-input :value="formatDate(formData.birthday)" readonly size="small"></el-input> <el-date-picker
v-model="formData.birthday"
type="date"
value-format="yyyy-MM-dd"
placeholder="请输入职工姓名后自动填充"
style="width: 100%">
</el-date-picker>
<!-- <el-input :value="formatDate(formData.birthday)" readonly size="small" placeholder="请输入职工姓名后自动填充"></el-input>-->
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="工会"> <el-descriptions-item label="工会">
<el-form-item prop="unionName"> <el-form-item prop="unionName">
<el-input v-model="formData.unionName" readonly size="small"></el-input> <el-input v-model="formData.unionName" readonly size="small" placeholder="请输入职工姓名后自动填充"></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="单位"> <el-descriptions-item label="单位">
<el-form-item prop="unitName"> <el-form-item prop="unitName">
<el-input v-model="formData.unitName" readonly size="small"></el-input> <el-input v-model="formData.unitName" readonly size="small" placeholder="请输入职工姓名后自动填充"></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="初始额度"> <el-descriptions-item label="初始额度">
<el-form-item prop="initMoney"> <el-form-item prop="initMoney">
<el-input v-model="formData.initMoney" readonly size="small"></el-input> <el-input v-model="formData.initMoney" readonly size="small" placeholder="请输入职工姓名后自动填充"></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="剩余额度" :span="2"> <el-descriptions-item label="剩余额度" :span="2">
<el-form-item prop="money"> <el-form-item prop="money">
<el-input v-model="formData.money" readonly size="small"></el-input> <el-input v-model="formData.money" readonly size="small" placeholder="请输入剩余额度"></el-input>
</el-form-item> </el-form-item>
</el-descriptions-item> </el-descriptions-item>
@@ -110,7 +118,7 @@ layout("/layouts/platform.html"){
</el-descriptions> </el-descriptions>
</el-form> </el-form>
<el-row type="flex" justify="end" class="mt20"> <el-row type="flex" justify="end" class="mt20">
<el-button type="primary" plain @click="onSave">保存</el-button> <el-button type="primary" @click="onSave">提交</el-button>
</el-row> </el-row>
</el-card> </el-card>
</div> </div>
@@ -232,7 +240,7 @@ layout("/layouts/platform.html"){
}, },
// 添加日期格式化方法 // 添加日期格式化方法
formatDate(date) { /*formatDate(date) {
if (!date) return ''; if (!date) return '';
// 如果已经是 yyyy-MM-dd 格式，直接返回 // 如果已经是 yyyy-MM-dd 格式，直接返回
if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}/.test(date)) { if (typeof date === 'string' && /^\d{4}-\d{2}-\d{2}/.test(date)) {
@@ -255,7 +263,7 @@ layout("/layouts/platform.html"){
} catch (e) { } catch (e) {
return date; return date;
} }
}, },*/
// 保存 // 保存
onSave() { onSave() {
src/main/resources/views/platform/zhgh/dayofficework/literacy/apply/index.html
+1 -1
View File
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
<guava ref="guava"> <guava ref="guava">
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
placeholder="选择年度" placeholder="选择年度"
type="year" type="year"
src/main/resources/views/platform/zhgh/dayofficework/literacy/manage/index.html
+1 -1
View File
@@ -22,7 +22,7 @@ layout("/layouts/platform.html"){
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
@change="doSearch" @change="doSearch"
placeholder="请选择年度" placeholder="请选择年度"
src/main/resources/views/platform/zhgh/dayofficework/literacy/statistics/index.html
+1 -1
View File
@@ -14,7 +14,7 @@ layout("/layouts/platform.html"){
<guava ref="guava"> <guava ref="guava">
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
placeholder="请选择年度" placeholder="请选择年度"
type="year" type="year"
src/main/resources/views/platform/zhgh/dayofficework/literacy/userAdjust/index.html
+1 -1
View File
@@ -10,7 +10,7 @@ layout("/layouts/platform.html"){
<guava ref="guava"> <guava ref="guava">
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
placeholder="请选择年度" placeholder="请选择年度"
type="year" type="year"
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/clubAudit/index.html
+6 -12
View File
@@ -17,18 +17,12 @@ layout("/layouts/platform.html"){
value-format="yyyy"> value-format="yyyy">
</el-date-picker> </el-date-picker>
</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">
<el-select placeholder="查询类型" slot="prepend" </el-input>
style="width: 100px;" </search-item>
v-model="pageForm.searchName">
<el-option label="姓名" value="info.userName"></el-option>
<el-option label="工号" value="info.loginName"></el-option>
</el-select>
</el-input>
</search-item>
</search> </search>
</el-card> </el-card>
<el-card shadow="never"> <el-card shadow="never">
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/clubZxAudit/index.html
+6 -12
View File
@@ -17,18 +17,12 @@ layout("/layouts/platform.html"){
value-format="yyyy"> value-format="yyyy">
</el-date-picker> </el-date-picker>
</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">
<el-select placeholder="查询类型" slot="prepend" </el-input>
style="width: 100px;" </search-item>
v-model="pageForm.searchName">
<el-option label="姓名" value="info.userName"></el-option>
<el-option label="工号" value="info.loginName"></el-option>
</el-select>
</el-input>
</search-item>
</search> </search>
</el-card> </el-card>
<el-card shadow="never"> <el-card shadow="never">
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolCnAudit/index.html
+6 -12
View File
@@ -17,18 +17,12 @@ layout("/layouts/platform.html"){
value-format="yyyy"> value-format="yyyy">
</el-date-picker> </el-date-picker>
</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">
<el-select placeholder="查询类型" slot="prepend" </el-input>
style="width: 100px;" </search-item>
v-model="pageForm.searchName">
<el-option label="姓名" value="info.userName"></el-option>
<el-option label="工号" value="info.loginName"></el-option>
</el-select>
</el-input>
</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%">
<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"
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolKjAudit/index.html
+6 -12
View File
@@ -17,18 +17,12 @@ layout("/layouts/platform.html"){
value-format="yyyy"> value-format="yyyy">
</el-date-picker> </el-date-picker>
</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">
<el-select placeholder="查询类型" slot="prepend" </el-input>
style="width: 100px;" </search-item>
v-model="pageForm.searchName">
<el-option label="姓名" value="info.userName"></el-option>
<el-option label="工号" value="info.loginName"></el-option>
</el-select>
</el-input>
</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%">
<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"
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/schoolZxAudit/index.html
+6 -12
View File
@@ -17,18 +17,12 @@ layout("/layouts/platform.html"){
value-format="yyyy"> value-format="yyyy">
</el-date-picker> </el-date-picker>
</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">
<el-select placeholder="查询类型" slot="prepend" </el-input>
style="width: 100px;" </search-item>
v-model="pageForm.searchName">
<el-option label="姓名" value="info.userName"></el-option>
<el-option label="工号" value="info.loginName"></el-option>
</el-select>
</el-input>
</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%">
<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"
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/summary/index.html
+6 -12
View File
@@ -17,18 +17,12 @@ layout("/layouts/platform.html"){
value-format="yyyy"> value-format="yyyy">
</el-date-picker> </el-date-picker>
</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">
<el-select placeholder="查询类型" slot="prepend" </el-input>
style="width: 100px;" </search-item>
v-model="pageForm.searchName">
<el-option label="姓名" value="info.userName"></el-option>
<el-option label="工号" value="info.loginName"></el-option>
</el-select>
</el-input>
</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%">
<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"
src/main/resources/views/platform/zhgh/dayofficework/outlay/outlayReimburse/unionAudit/index.html
+2 -8
View File
@@ -17,16 +17,10 @@ layout("/layouts/platform.html"){
value-format="yyyy"> value-format="yyyy">
</el-date-picker> </el-date-picker>
</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">
<el-select placeholder="查询类型" slot="prepend"
style="width: 100px;"
v-model="pageForm.searchName">
<el-option label="姓名" value="info.userName"></el-option>
<el-option label="工号" value="info.loginName"></el-option>
</el-select>
</el-input> </el-input>
</search-item> </search-item>
</search> </search>
src/main/resources/views/platform/zhgh/dayofficework/rest/activity/index.html
+1 -1
View File
@@ -5,7 +5,7 @@ layout("/layouts/platform.html"){
<div id="app" v-cloak> <div id="app" v-cloak>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker> <el-date-picker placeholder="请选择年度" type="year" style="width: 100%" v-model="pageForm.year" value-format="yyyy"></el-date-picker>
</search-item> </search-item>
<search-item label="名称"> <search-item label="名称">
src/main/resources/views/platform/zhgh/dayofficework/rest/query/index.html
+1 -1
View File
@@ -18,7 +18,7 @@ layout("/layouts/platform.html"){
<el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unionOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位："> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%"> <el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable style="width: 100%">
<el-option v-for="item in unitOptions" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unitOptions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/read/index.html
+2 -2
View File
@@ -31,7 +31,7 @@ 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.unionId" placeholder="请选择所属工会" filterable clearable <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
@change="doSearch" style="width: 100%"> @change="doSearch" style="width: 100%">
<el-option <el-option
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
</el-option> </el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位："> <search-item label="所属单位">
<el-select @change="doSearch" <el-select @change="doSearch"
clearable clearable
filterable filterable
src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html
+2 -2
View File
@@ -32,7 +32,7 @@ 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.unionId" placeholder="请选择所属工会" filterable clearable <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
@change="doSearch" style="width: 100%"> @change="doSearch" style="width: 100%">
<el-option <el-option
@@ -43,7 +43,7 @@ layout("/layouts/platform.html"){
</el-option> </el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位："> <search-item label="所属单位">
<el-select @change="doSearch" <el-select @change="doSearch"
clearable clearable
filterable filterable
src/main/resources/views/platform/zhgh/staffbenefit/contribution/detailed/index.html
+2 -2
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
:value="item.contributionName"></el-option> :value="item.contributionName"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属工会："> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
@change="doSearch" style="width: 100%"> @change="doSearch" style="width: 100%">
<el-option <el-option
@@ -34,7 +34,7 @@ layout("/layouts/platform.html"){
</el-option> </el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位："> <search-item label="所属单位">
<el-select @change="doSearch" <el-select @change="doSearch"
clearable clearable
filterable filterable
src/main/resources/views/platform/zhgh/staffbenefit/contribution/statistics/index.html
+1 -1
View File
@@ -23,7 +23,7 @@ layout("/layouts/platform.html"){
: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 v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable
@change="doSearch" style="width: 100%"> @change="doSearch" style="width: 100%">
<el-option <el-option
src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/activityList/index.html
+1 -1
View File
@@ -8,7 +8,7 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
v-model="pageForm.year" v-model="pageForm.year"
type="year" type="year"
src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/activitySignUp/index.html
+1 -1
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
v-model="pageForm.year" v-model="pageForm.year"
type="year" type="year"
src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/schoolAudit/index.html
+1 -1
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
v-model="pageForm.year" v-model="pageForm.year"
type="year" type="year"
src/main/resources/views/platform/zhgh/staffbenefit/excellentRecuperation/travelAgency/index.html
+1 -1
View File
@@ -11,7 +11,7 @@ layout("/layouts/platform.html"){
<template> <template>
<el-card shadow="never"> <el-card shadow="never">
<search @search="doSearch"> <search @search="doSearch">
<search-item label="年度："> <search-item label="年度">
<el-date-picker <el-date-picker
placeholder="请选择年度" placeholder="请选择年度"
type="year" type="year"
src/main/resources/views/platform/zhgh/staffbenefit/recuperation/line/index.html
+1 -1
View File
@@ -68,7 +68,7 @@ layout("/layouts/platform.html"){
></el-option> ></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')" label="所属工会："> <search-item v-if="$auth.hasRole('SYSADMIN') || $auth.hasRole('SCHOOL_UNION_ADMIN')" label="所属工会">
<el-select @change="doSearch" <el-select @change="doSearch"
clearable clearable
filterable filterable
src/main/resources/views/platform/zhgh/staffbenefit/recuperation/lineSelect/index.html
+1 -1
View File
@@ -56,7 +56,7 @@ layout("/layouts/platform.html"){
v-model="pageForm.keywords"> v-model="pageForm.keywords">
</el-input> </el-input>
</search-item> </search-item>
<search-item v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" label="所属工会："> <search-item v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])" label="所属工会">
<el-select @change="doSearch" v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable> <el-select @change="doSearch" v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable>
<el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhgh/staffbenefit/recuperation/statistics/index.html
+2 -2
View File
@@ -35,12 +35,12 @@ layout("/layouts/platform.html"){
<el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword" <el-input placeholder="请输入姓名或工号查询" clearable v-model="pageForm.searchKeyword"
@keyup.enter.native="doSearch"></el-input> @keyup.enter.native="doSearch"></el-input>
</search-item> </search-item>
<search-item label="所属工会："> <search-item label="所属工会">
<el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable @change="doSearch"> <el-select v-model="pageForm.unionId" placeholder="请选择所属工会" filterable clearable @change="doSearch">
<el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unionList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
</search-item> </search-item>
<search-item label="所属单位："> <search-item label="所属单位">
<el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable @change="doSearch"> <el-select v-model="pageForm.unitId" placeholder="请选择所属单位" filterable clearable @change="doSearch">
<el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option> <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select> </el-select>
src/main/resources/views/platform/zhghh5/staffmanage/member/info/board/index.html
+45 -37
View File
@@ -67,30 +67,29 @@ layout("/layouts/platform_h5.html"){
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
} }
.data-box { .data-box{
font-size: 13px; text-align: center;
margin: 12px 0; font-size:13px;
margin:12px 0;
.th-row {
height: 30px;
line-height: 30px;
padding: 0 12px;
background: #f8f8f8;
}
.td-row {
height: 30px;
line-height: 30px;
padding: 0 12px;
}
} }
.th-row,.td-row{
.common-ellipsis { display:flex;
width: 80px; height:30px;
height: 100%; line-height:30px;
overflow: hidden; padding:0 12px;
white-space: nowrap; }
text-overflow: ellipsis; .th-row{background:#f8f8f8;}
/* 关键：比例 + 最小宽度0 */
.col-index{flex:0 0 60px;} /* 序号固定60 */
.col-name{flex:1 1 120px;min-width:0;} /* 名称占剩余，最小120 */
.col-num{flex:0 0 80px;text-align:right;} /* 人数固定80 */
.common-ellipsis{
overflow:hidden;
white-space:nowrap;
text-overflow:ellipsis;
} }
</style> </style>
<div id="app" v-cloak> <div id="app" v-cloak>
@@ -169,20 +168,29 @@ layout("/layouts/platform_h5.html"){
<van-col span="24" class="center-col"> <van-col span="24" class="center-col">
<div class="col-title">工会会员数</div> <div class="col-title">工会会员数</div>
<div id="unionMemberChart" style="width: 100%; height: 200px"></div> <div id="unionMemberChart" style="width: 100%; height: 200px"></div>
<div class="data-box"> <div class="data-box">
<van-row class="th-row" style="display: flex"> <!-- 表头 -->
<van-col style="width: 80px">序号</van-col> <van-row class="th-row">
<van-col style="width: 200px">工会名称</van-col> <van-col class="col-index">序号</van-col>
<van-col style="width: 80px">会员人数</van-col> <van-col class="col-name">工会名称</van-col>
</van-row> <van-col class="col-num">会员人数</van-col>
</van-row>
<van-row class="td-row" :style="{background:index %2==0?'#fff':'#fafafa'}" v-for="(item,index) in unionMember" :key="index">
<van-col class="common-ellipsis">{{index + 1}}</van-col> <!-- 数据行 -->
<van-col style="width: 200px" class="common-ellipsis">{{item.unionname}}</van-col> <van-row
<van-col class="common-ellipsis">{{item.value}}</van-col> class="td-row"
</van-row> v-for="(item,index) in unionMember"
</div> :key="index"
:style="{background:index%2?'#fafafa':'#fff'}"
>
<van-col class="col-index">{{ index+1 }}</van-col>
<van-col class="col-name common-ellipsis" :title="item.unionname">
{{ item.unionname }}
</van-col>
<van-col class="col-num">{{ item.value }}</van-col>
</van-row>
</div>
</van-col> </van-col>
</van-row> </van-row>
</div> </div>
src/main/resources/views/platform/zhghh5/sys/home/home.js
+1 -1
View File
@@ -22,7 +22,7 @@ const home = {
@click="menuClick(item)" @click="menuClick(item)"
:key="item.id" :key="item.id"
:text="item.name"> :text="item.name">
<img :src="item.icon" <img :src="item.picIcon"
slot="icon" slot="icon"
style="width: 40px; height: 40px"/> style="width: 40px; height: 40px"/>
</van-grid-item> </van-grid-item>