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:
@jyuhsin
2025-09-02 19:01:08 +08:00
parent 405358e599
commit 3b1041edee
63 changed files with 8171 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js
+1 -1
View File
@@ -33,7 +33,7 @@ const clubUserJoin = {
{{viewData.unitName}}
</el-descriptions-item>
<el-descriptions-item label="职务">
{{viewData.governmentPosition}}
{{viewData.position}}
</el-descriptions-item>
<el-descriptions-item label="职称" :span="2">
{{viewData.technicalTitle}}
src/main/resources/views/platform/zhgh/club/join/apply/index.html
+5 -4
View File
@@ -56,8 +56,8 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="职务">
<el-form-item prop="governmentPosition" label="职务">
<el-input :value="formData.governmentPosition" readonly placeholder="读取信息中心数据"></el-input>
<el-form-item prop="position" label="职务">
<el-input :value="formData.position" readonly placeholder="读取信息中心数据"></el-input>
</el-form-item>
</el-descriptions-item>
<el-descriptions-item label="职称" :span="2">
@@ -143,7 +143,7 @@ layout("/layouts/platform.html"){
// birthday: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
// mobile: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
// email: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
governmentPosition: [{ required: false, message: "请填写", trigger: ["blur", "change"] }],
position: [{ required: false, message: "请填写", trigger: ["blur", "change"] }],
technicalTitle: [{ required: false, message: "请填写", trigger: ["blur", "change"] }],
education: [{ required: false, message: "请填写", trigger: ["blur", "change"] }],
academicDegree: [{ required: false, message: "请填写", trigger: ["blur", "change"] }],
@@ -251,7 +251,8 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "political", user.political)
this.$set(this.formData, "education", user.education)
this.$set(this.formData, "technicalTitle", user.technicalTitle)
this.$set(this.formData, "governmentPosition", user.governmentPosition)
this.$set(this.formData, "position", user.position)
this.$set(this.formData, "academicDegree", user.academicDegree)
}
}
},
src/main/resources/views/platform/zhgh/club/register/apply/clubRegisterForm.js
+2 -1
View File
@@ -10,7 +10,8 @@ const CLUB_FORM_TEMPLATE = {
</el-col>
<el-col :span="12">
<el-form-item label="协会编码" prop="clubCode">
<el-input placeholder="请输入协会编码" v-model="formData.clubCode" disabled></el-input>
<el-input v-if="$auth.hasRoleOr('SYSADMIN, SCHOOL_UNION_ADMIN')" placeholder="请输入协会编码" v-model="formData.clubCode"></el-input>
<el-input v-else placeholder="请输入协会编码" v-model="formData.clubCode" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
src/main/resources/views/platform/zhgh/club/register/apply/index.html
+4 -4
View File
@@ -104,13 +104,13 @@ layout("/layouts/platform.html"){
let formData = {}
try {
let hz = this.$refs.clubManagerRef.managePerson.filter((o) => o.roleCode === CLUB_ROLE_CONSTANT.CLUB_PRESIDENT)
if (hz.length > 1) {
this.$message.warning({ title: "警告", message: "会长只能有1人！" })
if (hz.length !== 1) {
this.$message.warning({ title: "警告", message: "会长需要1人" })
return
}
let msz = this.$refs.clubManagerRef.managePerson.filter((o) => o.roleCode === CLUB_ROLE_CONSTANT.CLUB_SECRETARY)
if (msz.length > 1) {
this.$message.warning({ title: "警告", message: "秘书长只能有1人" })
if (msz.length !== 1) {
this.$message.warning({ title: "警告", message: "秘书长需要1人" })
return
}
formData.sponsor = this.$refs.clubSponsorRef.sponsorData