diff --git a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
index bd650fa..fb19ae9 100644
--- a/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
+++ b/src/main/java/com/budwk/app/zhgh/activity/basic/controller/ActivityBasicScopeController.java
@@ -392,6 +392,8 @@ public class ActivityBasicScopeController {
} catch (Exception e) {
throw new RuntimeException(e);
}
+
+ cnd.and("u.member", "=", 1);
return cnd;
}
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
index 4e957e1..a080766 100644
--- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
+++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyActivity.js
@@ -587,7 +587,7 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
groupId: [{required: true, message: "必填", trigger: ["blur", "change"]}],
name: [{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"]}],
plannedDate: [{required: true, message: "必填", trigger: ["blur", "change"]}],
time: [{required: true, message: "必填", trigger: ["blur", "change"]}],
@@ -647,10 +647,10 @@ const ACTIVITY_CULTURE_APPLY_ACTIVITY = {
},
// 保存
onSave() {
- if (!this.formData.projectTypeCode) {
+ /*if (!this.formData.projectTypeCode) {
this.$message.error("请选择活动项目类型")
return
- }
+ }*/
if (!this.formData.clubId && this.activity_type === 40003) {
this.$message.error("请选择活动所属协会")
return
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js b/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js
index 56ae75a..638ac76 100644
--- a/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js
+++ b/src/main/resources/views/platform/zhgh/activity/culture/common/applyUser.js
@@ -56,7 +56,8 @@ const ACTIVITY_CULTURE_APPLY_USER = {
{{row.startTime}} 至 {{row.endTime}}
- {{row.projectTypeName}}({{row.projectTypeCode}})
+ {{row.projectTypeName}}({{row.projectTypeCode}})
+ 暂无
{{row.unionname?row.unionname:'暂无'}}
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js
index 999e47a..8fab9f7 100644
--- a/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js
+++ b/src/main/resources/views/platform/zhgh/activity/culture/common/auditActivity.js
@@ -72,7 +72,8 @@ const ACTIVITY_CULTURE_AUDIT_ACTIVITY = {
- {{row.projectTypeName}}({{row.projectTypeCode}})
+ {{row.projectTypeName}}({{row.projectTypeCode}})
+ 暂无
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js b/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js
index 2599111..9038b7b 100644
--- a/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js
+++ b/src/main/resources/views/platform/zhgh/activity/culture/common/infoActivity.js
@@ -20,7 +20,7 @@ const ACTIVITY_CULTURE_INFO_ACTIVITY = {
{{ viewData.activityCode }}
-
+
{{ viewData.projectTypeName }}({{ viewData.projectTypeCode }})
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js b/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js
index 0a03437..f835455 100644
--- a/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js
+++ b/src/main/resources/views/platform/zhgh/activity/culture/common/infoMange.js
@@ -54,7 +54,8 @@ const ACTIVITY_CULTURE_INFO_MANAGE = {
- {{row.projectTypeName}}({{row.projectTypeCode}})
+ {{row.projectTypeName}}({{row.projectTypeCode}})
+ 暂无
diff --git a/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js b/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js
index 8d9808d..b08682e 100644
--- a/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js
+++ b/src/main/resources/views/platform/zhgh/activity/culture/common/singleSignUp.js
@@ -17,7 +17,7 @@ const singleSignUp = {
{{ viewData.activityCode }}
-
+
{{ viewData.projectTypeName }}({{ viewData.projectTypeCode }})