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

commit

Browse Source
This commit is contained in:
@jyuhsin
2026-03-27 16:27:06 +08:00
parent a88dd6cef4
commit 3dbf38aada
7 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
+2
View File
@@ -392,6 +392,8 @@ public class ActivityBasicScopeController {
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
cnd.and("u.member", "=", 1);
return cnd; return cnd;
} }
src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
+3 -3
View File
@@ -587,7 +587,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
groupId: [{required: true, message: "必填", trigger: ["blur", "change"]}], groupId: [{required: true, message: "必填", trigger: ["blur", "change"]}],
name: [{required: true, message: "必填", trigger: ["blur", "change"]}], name: [{required: true, message: "必填", trigger: ["blur", "change"]}],
type: [{required: true, message: "必填", trigger: ["blur", "change"]}], type: [{required: true, message: "必填", trigger: ["blur", "change"]}],
projectTypeCode: [{required: true, message: "必填", trigger: ["blur", "change"]}], //projectTypeCode: [{required: true, message: "必填", trigger: ["blur", "change"]}],
address: [{required: true, message: "必填", trigger: ["blur", "change"]}], address: [{required: true, message: "必填", trigger: ["blur", "change"]}],
plannedDate: [{required: true, message: "必填", trigger: ["blur", "change"]}], plannedDate: [{required: true, message: "必填", trigger: ["blur", "change"]}],
time: [{required: true, message: "必填", trigger: ["blur", "change"]}], time: [{required: true, message: "必填", trigger: ["blur", "change"]}],
@@ -647,10 +647,10 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
}, },
// 保存 // 保存
onSave() { onSave() {
if (!this.formData.projectTypeCode) { /*if (!this.formData.projectTypeCode) {
this.$message.error("请选择活动项目类型") this.$message.error("请选择活动项目类型")
return return
} }*/
if (!this.formData.clubId && this.activity_type === 40003) { if (!this.formData.clubId && this.activity_type === 40003) {
this.$message.error("请选择活动所属协会") this.$message.error("请选择活动所属协会")
return return
src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js
+2 -1
View File
@@ -56,7 +56,8 @@ const ACTIVITY_CULTURE_APPLY_USER = {
{{row.startTime}} 至 {{row.endTime}} {{row.startTime}} 至 {{row.endTime}}
</template> </template>
<template scope="{row}" v-else-if="column.prop=='projectTypeName'"> <template scope="{row}" v-else-if="column.prop=='projectTypeName'">
{{row.projectTypeName}}({{row.projectTypeCode}}) <span v-if="viewData.projectTypeCode">{{row.projectTypeName}}({{row.projectTypeCode}})</span>
<span v-else>暂无</span>
</template> </template>
<template scope="{row}" v-else-if="column.prop=='tussueName'"> <template scope="{row}" v-else-if="column.prop=='tussueName'">
<span v-if="row.activity_type==40002">{{row.unionname?row.unionname:'暂无'}}</span> <span v-if="row.activity_type==40002">{{row.unionname?row.unionname:'暂无'}}</span>
src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js
+2 -1
View File
@@ -72,7 +72,8 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
</template> </template>
<template scope="{row}" v-else-if="column.prop=='projectTypeName'"> <template scope="{row}" v-else-if="column.prop=='projectTypeName'">
{{row.projectTypeName}}({{row.projectTypeCode}}) <span v-if="row.projectTypeCode">{{row.projectTypeName}}({{row.projectTypeCode}})</span>
<span v-else>暂无</span>
</template> </template>
<template scope="{row}" v-else-if="column.prop=='curTaskName'"> <template scope="{row}" v-else-if="column.prop=='curTaskName'">
src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js
+1 -1
View File
@@ -20,7 +20,7 @@ const ACTIVITY_CULTURE_INFO_ACTIVITY = {
<el-descriptions-item label="活动编号"> <el-descriptions-item label="活动编号">
{{ viewData.activityCode }} {{ viewData.activityCode }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="活动项目类型"> <el-descriptions-item label="活动项目类型" v-if="viewData.projectTypeCode">
{{ viewData.projectTypeName }}({{ viewData.projectTypeCode }}) {{ viewData.projectTypeName }}({{ viewData.projectTypeCode }})
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="活动类型" :span="2"> <el-descriptions-item label="活动类型" :span="2">
src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js
+2 -1
View File
@@ -54,7 +54,8 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
</template> </template>
<template scope="{row}" v-else-if="column.prop=='projectTypeName'"> <template scope="{row}" v-else-if="column.prop=='projectTypeName'">
{{row.projectTypeName}}({{row.projectTypeCode}}) <span v-if="row.projectTypeCode">{{row.projectTypeName}}({{row.projectTypeCode}})</span>
<span v-else>暂无</span>
</template> </template>
<template scope="{row}" v-else-if="column.prop=='tussueName'"> <template scope="{row}" v-else-if="column.prop=='tussueName'">
src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js
+1 -1
View File
@@ -17,7 +17,7 @@ const singleSignUp = {
<el-descriptions-item label="活动编号"> <el-descriptions-item label="活动编号">
{{ viewData.activityCode }} {{ viewData.activityCode }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="活动项目类型"> <el-descriptions-item label="活动项目类型" v-if="viewData.projectTypeCode">
{{ viewData.projectTypeName }}({{ viewData.projectTypeCode }}) {{ viewData.projectTypeName }}({{ viewData.projectTypeCode }})
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="活动类型" :span="2"> <el-descriptions-item label="活动类型" :span="2">