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-09 11:19:04 +08:00
parent eb493d2881
commit bee7b352a6
23 changed files with 169 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js
-1
View File
@@ -92,7 +92,6 @@ const clubUserJoin = {
data() {
return {
viewData: {},
activeName: "first",
row: {},
doneTasks: [],
}
src/main/resources/views/platform/zhgh/club/evaluate/schoolAudit/index.html
+1 -1
View File
@@ -47,7 +47,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="申请时间" prop="applyTime" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/club/examine/schoolAudit/index.html
+1 -1
View File
@@ -44,7 +44,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="申请时间" prop="registerDate" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/club/infoManage/auditManager/index.html
+1 -1
View File
@@ -45,7 +45,7 @@ layout("/layouts/platform.html"){
<el-table-column label="变更用户" prop="changeUserName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="旧身份" prop="oldRoleName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="新身份" prop="nowRoleName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/club/infoManage/change/index.html
+1 -1
View File
@@ -90,7 +90,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<div style="float: right;margin: 20px 0">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button @click="$refs.guava.index()">取 消</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提 交</el-button>
<el-button type="primary" @click="onFinishTask" v-else>提 交</el-button>
</div>
src/main/resources/views/platform/zhgh/club/infoManage/refreshReport/index.html
+1 -1
View File
@@ -82,7 +82,7 @@ layout("/layouts/platform.html"){
</el-form-item>
</el-form>
<div style="float: right;margin: 20px 0">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button @click="$refs.guava.index()">取 消</el-button>
<el-button type="primary" @click="onSubmit" v-if="!taskId">提 交</el-button>
<el-button type="primary" @click="onFinishTask" v-else>提 交</el-button>
</div>
src/main/resources/views/platform/zhgh/club/infoManage/schoolAuditReport/index.html
+1 -1
View File
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请人" prop="userName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="creatTime" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/club/infoManage/schoolAuditRule/index.html
+1 -1
View File
@@ -42,7 +42,7 @@ layout("/layouts/platform.html"){
<el-table-column label="协会名称" prop="clubName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请人" prop="userName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="申请时间" prop="creatTime" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/club/join/apply/index.html
+15 -20
View File
@@ -136,20 +136,20 @@ layout("/layouts/platform.html"){
taskId: GetQueryString("taskId"),
formData: {},
formRules: {
clubId: [{ required: true, message: "请选择", trigger: ["blur", "change"] }],
userName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
loginName: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
sex: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
clubId: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
userName: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
loginName: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
sex: [{ required: true, message: "必填", trigger: ["blur", "change"] }],
// birthday: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
// mobile: [{ required: true, message: "请填写", trigger: ["blur", "change"] }],
// email: [{ required: true, 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"] }],
sameTimeJoinOtherClubSituation: [{ required: false, message: "请填写", trigger: ["blur", "change"] }],
awardsExperience: [{ required: false, message: "请填写", trigger: ["blur", "change"] }],
photo: [{ 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"] }],
sameTimeJoinOtherClubSituation: [{ required: false, message: "必填", trigger: ["blur", "change"] }],
awardsExperience: [{ required: false, message: "必填", trigger: ["blur", "change"] }],
photo: [{ required: false, message: "必填", trigger: ["blur", "change"] }]
},
isAgree: false,
clubOptions: []
@@ -211,11 +211,9 @@ layout("/layouts/platform.html"){
},
checkApplyClub(val) {
this.$axios.post("/platform/club/join/apply/checkApplyClub", { clubId: val }).then((res) => {
if (res.code === 0) {
if (res.data) {
this.$message.warning("您已申请加入该协会，请勿重复申请")
this.formData.clubId = ""
}
if (res.code !== 0) {
this.$message.warning("您已申请加入该协会，请勿重复申请")
this.formData.clubId = ""
}
})
},
@@ -228,9 +226,6 @@ layout("/layouts/platform.html"){
},
init() {
this.bizId = GetQueryString("bizId")
if (GetQueryString("clubId")) {
this.$set(this.formData, "clubId", GetQueryString("clubId"))
}
if (this.bizId) {
this.$axios.post("/platform/club/join/apply/info", { id: this.bizId }).then((res) => {
if (res.code === 0) {
@@ -248,7 +243,7 @@ layout("/layouts/platform.html"){
this.$set(this.formData, "unionId", user.union ? user.union.id : null)
this.$set(this.formData, "unionName", user.union ? user.union.name : null)
this.$set(this.formData, "sex", user.sex)
this.$set(this.formData, "birthday", "${@auth.getPrincipalProperty('birthday'),'yyyy-MM-dd'}")
this.$set(this.formData, "birthday", user.birthday ? this.$moment(user.birthday).format('yyyy-MM-dd') : '')
this.$set(this.formData, "nation", user.nation)
this.$set(this.formData, "political", user.political)
this.$set(this.formData, "education", user.education)
src/main/resources/views/platform/zhgh/club/join/clubApproval/index.html
+1 -1
View File
@@ -57,7 +57,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请时间" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/club/join/mine/index.html
+1 -1
View File
@@ -92,7 +92,7 @@ layout("/layouts/platform.html"){
})
},
onEdit(row) {
location.href = '/platform/club/join/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id + '&clubId=' + row.clubId
location.href = '/platform/club/join/apply?taskId=' + (row.startTaskId || '') + "&bizId=" + row.id
},
onDelete(id) {
this.$confirm("确定要删除此申请吗？", "提示", {
src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html
+1 -1
View File
@@ -57,7 +57,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column prop="applyDate" label="申请时间" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/club/register/schoolReply/index.html
+1 -1
View File
@@ -50,7 +50,7 @@ layout("/layouts/platform.html"){
</template>
</el-table-column>
<el-table-column label="发起人" prop="sponsorName" sortable show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="taskName" show-overflow-tooltip></el-table-column>
<el-table-column label="当前节点" prop="curTaskName" show-overflow-tooltip></el-table-column>
<el-table-column label="流程状态" prop="instanceState" show-overflow-tooltip>
<template v-slot="{ row }">
<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message" size="small"></enum-tag>
src/main/resources/views/platform/zhgh/staffbenefit/condolence/branchUnionApproval/index.html
+1 -1
View File
@@ -116,7 +116,7 @@ layout("/layouts/platform.html"){
{prop: 'applyUnionName', label: '所属工会'},
{prop: 'applyUnitName', label: '所属单位'},
{prop: 'typeName', label: '慰问类型'},
{prop: 'taskName', label: '当前节点'},
{prop: 'curTaskName', label: '当前节点'},
{prop: 'instanceState', label: '流程状态'},
],
formData: {},
src/main/resources/views/platform/zhgh/staffbenefit/condolence/schoolUnionApproval/index.html
+1 -1
View File
@@ -137,7 +137,7 @@ layout("/layouts/platform.html"){
{prop: 'applyUnionName', label: '所属工会'},
{prop: 'applyUnitName', label: '所属单位'},
{prop: 'typeName', label: '慰问类型'},
{prop: 'taskName', label: '当前节点'},
{prop: 'curTaskName', label: '当前节点'},
{prop: 'instanceState', label: '流程状态'},
],
unionList: [],