diff --git a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java
index 46b3967..352689e 100644
--- a/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java
+++ b/src/main/java/io/v/nutz/sys/controllers/platform/sys/club/regist/ClubXghReplyController.java
@@ -1,5 +1,7 @@
package io.v.nutz.sys.controllers.platform.sys.club.regist;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
import cn.wizzer.framework.page.Pagination;
import io.v.nutz.base.annontation.ViReturn;
import io.v.nutz.base.utils.Roles;
@@ -112,8 +114,8 @@ public class ClubXghReplyController {
dao.insert(userRoles);
sysUserService.clearCache();
sysRoleService.clearCache();
+ club.setFoundTime(StrUtil.blankToDefault(sys_club.getFoundTime(), DateUtil.now()));
}
- club.setFoundTime(sys_club.getFoundTime());
club.setSchoolReplyFile(sys_club.getSchoolReplyFile());
club.setXghAuditId(audit.getId());
dao.updateIgnoreNull(club);
diff --git a/src/main/resources/static/components/club/clubRegistInfo.vue b/src/main/resources/static/components/club/clubRegistInfo.vue
index ceffd12..cbde6ac 100644
--- a/src/main/resources/static/components/club/clubRegistInfo.vue
+++ b/src/main/resources/static/components/club/clubRegistInfo.vue
@@ -248,4 +248,12 @@ module.exports = {
text-align: center !important;
}
+ .el-descriptions-item__label {
+ min-width: 200px !important;
+ }
+
+ .el-descriptions .is-bordered .el-descriptions-item__cell {
+ min-width: 200px !important;
+ }
+
diff --git a/src/main/resources/views/platform/sys/club/applyIn/sqrt.html b/src/main/resources/views/platform/sys/club/applyIn/sqrt.html
index b63fd9c..fa1172f 100644
--- a/src/main/resources/views/platform/sys/club/applyIn/sqrt.html
+++ b/src/main/resources/views/platform/sys/club/applyIn/sqrt.html
@@ -199,239 +199,7 @@ layout("/layouts/platform.html"){
-
-
-
-
- 协会名称
-
-
-
- {{detailData.foundtime}}
-
-
- {{detailData.code}}
-
-
- {{detailData.typename}}
-
-
- {{detailData.sponsorname}}
-
-
- 报名联系人
- {{detailData.fzrname}}
-
-
- 所属单位
- {{detailData.fzr_unit_name}}
-
-
- 联系人电话
- {{detailData.concatpersonmobile}}
-
-
- 联系人邮箱
- {{detailData.concatpersonemail}}
-
-
- 会费标准
- {{detailData.dues_standard}}
-
-
- 当前人数
- {{detailData.cynum}}
-
-
-
- 协会介绍
-
-
-
- 协会宗旨
-
-
-
- 钉钉二维码
-
-
-
-
- 协会章程
-
-
-
- 年度活动计划
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 申请加入
-
-
-
+
@@ -682,8 +450,6 @@ layout("/layouts/platform.html"){
familyRelation: [{required: true, message: '必填', trigger: ['blur', 'change']}],
familyMobile: [{required: true, message: '必填', trigger: ['blur', 'change']}],
},
- infoActive: 'first',
- detailData: {},
activeName: 'false',
tableData: [],
pageForm: {
@@ -699,9 +465,11 @@ layout("/layouts/platform.html"){
hasJoinCount: 0,
noJoinCount: 0,
clickRow: {},
- viewType: '',
}
},
+ components: {
+ 'club-regist-info': httpVueLoader('/components/club/clubRegistInfo.vue'),
+ },
methods: {
async yearAudit(row) {
this.$confirm('您确定要提交今年的年审吗？', '提示', {
@@ -777,39 +545,12 @@ layout("/layouts/platform.html"){
});
},
openDetail(row, type) {
- this.viewType = type
- this.infoActive = type === 'view' ? 'first' : 'second'
- if (type === 'join') {
- this.formData = {
- username: "${@shiro.getPrincipalProperty('username')}",
- loginname: "${@shiro.getPrincipalProperty('loginname')}",
- sex: "${@shiro.getPrincipalProperty('sex')}",
- birthday: "${@shiro.getPrincipalProperty('birthday')}",
- birthPlace: "${@shiro.getPrincipalProperty('birthPlace')}",
- education: "${@shiro.getPrincipalProperty('education')}",
- hobby: "${@shiro.getPrincipalProperty('hobby')}",
- unitName: "${@shiro.getPrincipalProperty('unit').getName()}",
- position: "${@shiro.getPrincipalProperty('position')}",
- mobile: "${@shiro.getPrincipalProperty('mobile')}",
- email: "${@shiro.getPrincipalProperty('email')}",
- homeAddress: "${@shiro.getPrincipalProperty('homeAddress')}",
- }
- this.$nextTick(() => {
- this.$refs.form.clearValidate()
- })
- }
this.clickRow = row
- $.get(base + "/platform/sys/club/mange/findOne", {id: row.id}, (data) => {
- if (data.code === 0) {
- this.detailData = data.data
- this.$refs.guava.view()
- } else {
- this.$message({
- message: data.msg,
- type: 'error'
- });
- }
- }, "json");
+ const {id} = row
+ this.$refs.guava.view()
+ this.$nextTick(() => {
+ this.$refs.info.getInfo(id)
+ })
},
openApply(row) {
diff --git a/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html b/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
index 3e08931..49b1ec8 100644
--- a/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
+++ b/src/main/resources/views/platform/sys/club/regist/clubRegistApply.html
@@ -37,6 +37,19 @@ layout("/layouts/platform.html"){
+
+
+
+
+
+
+
+
@@ -53,19 +66,7 @@ layout("/layouts/platform.html"){
-
-
-
-
-
-
-
-
+