diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java index 939e2b28..4e8d21a0 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseCollectController.java @@ -24,6 +24,7 @@ import org.nutz.dao.Cnd; import org.nutz.dao.Dao; import org.nutz.dao.Sqls; 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.IocBean; import org.nutz.lang.util.NutMap; @@ -71,7 +72,7 @@ public class UnionReimburseCollectController { @Param(value = "unionId") String unionId, @Param(value = "unitId") String unitId, @Param(value = "reimburseProject") String reimburseProject, - @Param(value = "userName") String userName) { + @Param(value = "userName") String searchKeyword) { Sql sql = Sqls.create(""" SELECT info.*, @@ -108,9 +109,12 @@ public class UnionReimburseCollectController { // 报销项目查询条件 cnd.andEX("info.reimburseProject", "=", reimburseProject); - // 经办人姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); + // 姓名和工号查询条件 + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", "%" + searchKeyword + "%"); + seg.orLike("info.loginName", "%" + searchKeyword + "%"); + cnd.and(seg); } // 只查询流程实例状态为20的数据(已完成状态) diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java index 894c4810..2a0a54e9 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseMineController.java @@ -18,6 +18,7 @@ import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -61,11 +62,11 @@ public class UnionReimburseMineController { @ApiOperation("分页查询") @SaCheckPermission(value = {"unionReimburse.mine", "h5.unionReimburse.mine"}, mode = SaMode.OR) public Result pageData(PageForm pageForm, - @Param(value = "year") Integer year, - @Param(value = "unionId") String unionId, - @Param(value = "unitId") String unitId, - @Param(value = "reimburseProject") String reimburseProject, - @Param(value = "userName") String userName) { + Integer year, + String unionId, + String unitId, + String reimburseProject, + String searchKeyword) { Sql sql = Sqls.create(""" SELECT info.*, @@ -102,9 +103,12 @@ public class UnionReimburseMineController { // 报销项目查询条件 cnd.andEX("info.reimburseProject", "=", reimburseProject); - // 经办人姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); + // 姓名和工号查询条件 + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", "%" + searchKeyword + "%"); + seg.orLike("info.loginName", "%" + searchKeyword + "%"); + cnd.and(seg); } cnd.desc("info.createTime"); cnd.and("info.userId", "=", SecurityUtil.getUserId()); diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseReviewController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseReviewController.java index 1fc76ddf..fc05c745 100644 --- a/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseReviewController.java +++ b/src/main/java/com/budwk/app/zhgh/dayofficework/unionReimburse/controller/UnionReimburseReviewController.java @@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; 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.IocBean; import org.nutz.lang.util.NutMap; @@ -57,7 +58,7 @@ public class UnionReimburseReviewController { String unionId, String unitId, String reimburseProject, - String userName) { + String searchKeyword) { Sql sql = Sqls.create(""" SELECT info.*, @@ -106,9 +107,12 @@ public class UnionReimburseReviewController { cnd.andEX("info.reimburseProject", "=", reimburseProject); - // 经办人姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); + // 姓名和工号查询条件 + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", "%" + searchKeyword + "%"); + seg.orLike("info.loginName", "%" + searchKeyword + "%"); + cnd.and(seg); } if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.desc("info.createTime"); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxCollectController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxCollectController.java index e1789f38..b20a3f1c 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxCollectController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxCollectController.java @@ -23,6 +23,7 @@ import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -70,7 +71,7 @@ public class DsznfmtxCollectController { Integer year, String unionId, String unitId, - String userName, + String searchKeyword, String sex) { Sql sql = Sqls.create(""" SELECT @@ -109,9 +110,12 @@ public class DsznfmtxCollectController { // 性别查询条件 cnd.andEX("info.sex", "=", sex); - // 姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); + // 姓名和工号查询条件 + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", "%" + searchKeyword + "%"); + seg.orLike("info.loginName", "%" + searchKeyword + "%"); + cnd.and(seg); } // 只查询流程实例状态为20的数据(已完成状态) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxSchoolAuditController.java index ad275b7c..cad610d0 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxSchoolAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxSchoolAuditController.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; 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.IocBean; import org.nutz.lang.util.NutMap; @@ -59,7 +60,7 @@ public class DsznfmtxSchoolAuditController { Integer year, String unionId, String unitId, - String userName, + String searchKeyword, String sex) { Sql sql = Sqls.create(""" SELECT @@ -108,9 +109,12 @@ public class DsznfmtxSchoolAuditController { // 性别查询条件 cnd.andEX("info.sex", "=", sex); - // 姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); + // 姓名和工号查询条件 + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", "%" + searchKeyword + "%"); + seg.orLike("info.loginName", "%" + searchKeyword + "%"); + cnd.and(seg); } if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.desc("info.applyTime"); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxUnionAuditController.java index d7aab081..1c8838b3 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxUnionAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxUnionAuditController.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; 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.IocBean; import org.nutz.lang.util.NutMap; @@ -59,7 +60,7 @@ public class DsznfmtxUnionAuditController { Integer year, String unionId, String unitId, - String userName, + String searchKeyword, String sex) { Sql sql = Sqls.create(""" SELECT @@ -108,9 +109,12 @@ public class DsznfmtxUnionAuditController { // 性别查询条件 cnd.andEX("info.sex", "=", sex); - // 姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); + // 姓名和工号查询条件 + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", "%" + searchKeyword + "%"); + seg.orLike("info.loginName", "%" + searchKeyword + "%"); + cnd.and(seg); } if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.desc("info.applyTime"); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveCollectController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveCollectController.java index 743fa988..7b2ca84e 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveCollectController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveCollectController.java @@ -24,6 +24,7 @@ import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -71,7 +72,7 @@ public class MaternityLeaveCollectController { Integer year, String unionId, String unitId, - String userName, + String searchKeyword, String sex) { Sql sql = Sqls.create(""" SELECT @@ -110,9 +111,12 @@ public class MaternityLeaveCollectController { // 性别查询条件 cnd.andEX("info.sex", "=", sex); - // 姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); + // 姓名和工号查询条件 + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", "%" + searchKeyword + "%"); + seg.orLike("info.loginName", "%" + searchKeyword + "%"); + cnd.and(seg); } // 只查询流程实例状态为20的数据(已完成状态) diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveSchoolAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveSchoolAuditController.java index 471f0376..4187092b 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveSchoolAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveSchoolAuditController.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; 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.IocBean; import org.nutz.lang.util.NutMap; @@ -59,7 +60,7 @@ public class MaternityLeaveSchoolAuditController { Integer year, String unionId, String unitId, - String userName, + String searchKeyword, String sex) { Sql sql = Sqls.create(""" SELECT @@ -108,9 +109,12 @@ public class MaternityLeaveSchoolAuditController { // 性别查询条件 cnd.andEX("info.sex", "=", sex); - // 姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); + // 姓名和工号查询条件 + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", "%" + searchKeyword + "%"); + seg.orLike("info.loginName", "%" + searchKeyword + "%"); + cnd.and(seg); } if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.desc("info.applyTime"); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveUnionAuditController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveUnionAuditController.java index 7e99c34e..3b2c7b63 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveUnionAuditController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/maternityLeave/controller/MaternityLeaveUnionAuditController.java @@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; 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.IocBean; import org.nutz.lang.util.NutMap; @@ -59,7 +60,7 @@ public class MaternityLeaveUnionAuditController { Integer year, String unionId, String unitId, - String userName, + String searchKeyword, String sex) { Sql sql = Sqls.create(""" SELECT @@ -108,9 +109,12 @@ public class MaternityLeaveUnionAuditController { // 性别查询条件 cnd.andEX("info.sex", "=", sex); - // 姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); + // 姓名和工号查询条件 + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", "%" + searchKeyword + "%"); + seg.orLike("info.loginName", "%" + searchKeyword + "%"); + cnd.and(seg); } if (StrUtil.isAllBlank(pageForm.getPageOrderName(), pageForm.getPageOrderBy())) { cnd.desc("info.applyTime"); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceCollectController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceCollectController.java index 4a660e72..64c3deb7 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceCollectController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/mutualInsurance/controller/MutualInsuranceCollectController.java @@ -24,6 +24,7 @@ import org.nutz.aop.interceptor.ioc.TransAop; import org.nutz.dao.Cnd; import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; +import org.nutz.dao.util.cri.SqlExpressionGroup; import org.nutz.ioc.aop.Aop; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; @@ -71,7 +72,7 @@ public class MutualInsuranceCollectController { String projectId, String unionId, String unitId, - String userName, + String searchKeyword, String sex) { Sql sql = Sqls.create(""" SELECT @@ -113,9 +114,12 @@ public class MutualInsuranceCollectController { // 性别查询条件 cnd.andEX("info.sex", "=", sex); - // 姓名查询条件 - if (StrUtil.isNotBlank(userName)) { - cnd.and("info.userName", "like", "%" + userName + "%"); + // 姓名和工号查询条件 + if (StrUtil.isNotBlank(searchKeyword)) { + SqlExpressionGroup seg = new SqlExpressionGroup(); + seg.orLike("info.userName", "%" + searchKeyword + "%"); + seg.orLike("info.loginName", "%" + searchKeyword + "%"); + cnd.and(seg); } // 只查询流程实例状态为20的数据(已完成状态) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html index 6a13a098..333c3d37 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/collect/index.html @@ -25,8 +25,8 @@ layout("/layouts/platform.html"){ > - - + + @@ -34,9 +34,9 @@ layout("/layouts/platform.html"){ - + + placeholder="请选择分工会" clearable> - + + placeholder="请选择单位" clearable> - - + + @@ -33,9 +33,9 @@ layout("/layouts/platform.html"){ - + + placeholder="请选择分工会" clearable> - + + placeholder="请选择单位" clearable> - + + + + + placeholder="请选择分工会" clearable> - + + placeholder="请选择单位" clearable> - - - - - - - @@ -129,32 +112,10 @@ layout("/layouts/platform.html"){ pageDataUrl: "/platform/unionReimburse/collect/pageData", unionOptions: [], unitOptions: [], - userOptions: [], } } , 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) { this.$refs.guava.edit(()=>{ this.showApprovalForm = false diff --git a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html index 70086a44..7e88be3a 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/mine/index.html @@ -9,9 +9,12 @@ layout("/layouts/platform.html"){ - + + + + + placeholder="请选择分工会" clearable> - + + placeholder="请选择单位" clearable> - - - - - - - @@ -129,33 +112,10 @@ layout("/layouts/platform.html"){ pageDataUrl: "/platform/unionReimburse/mine/pageData", unionOptions: [], unitOptions: [], - userOptions: [], } } , 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) { this.$refs.guava.view(()=>{ this.$refs.unionReimburseInfoRef.onOpen(row) diff --git a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html index 7212302b..fc85fc29 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/unionReimburse/review/index.html @@ -9,9 +9,12 @@ layout("/layouts/platform.html"){ - + + + + + placeholder="请选择分工会" clearable> - + + placeholder="请选择单位" clearable> - - - - - - - @@ -158,33 +141,10 @@ layout("/layouts/platform.html"){ showApprovalForm: false, unionOptions: [], unitOptions: [], - userOptions: [], } } , 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) { this.$refs.guava.edit(()=>{ this.showApprovalForm = false diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html index 23464972..67f2f6c8 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html @@ -347,6 +347,7 @@ layout("/layouts/platform.html"){ if (this.bizId) { this.findOne(this.bizId).then(async data => { this.formData = data + console( data) }) } else { const {id, username, loginname, union, unit, sex, birthday} = this.$store.state.user diff --git a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/collect/index.html b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/collect/index.html index 56451b47..5e1a47db 100644 --- a/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/collect/index.html +++ b/src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/collect/index.html @@ -9,8 +9,8 @@ layout("/layouts/platform.html"){ - - + + @@ -18,9 +18,9 @@ layout("/layouts/platform.html"){ - + + placeholder="请选择分工会" clearable> - + + placeholder="请选择单位" clearable> + @@ -53,7 +54,6 @@ layout("/layouts/platform.html"){ - ·