From 70492aa4f5f508ae2e370ab9382d471f6ea01541 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 23 Jun 2025 23:18:31 +0800
Subject: [PATCH] 通知发送

---
 src/api/oa/activitiesManageApi.js          | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/api/oa/activitiesTypeManageApi.js      |  78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/admin/AddAdvert.vue         |  19 +++++++++++--------
 src/components/oa/addActivitiesType.vue    |  95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/oa/addActivitiesView.vue    | 141 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/oa/deleteActivities.vue     |  76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/oa/deleteActivitiesType.vue |  73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/oa/editActivitiesType.vue   | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/components/oa/editActivitiesView.vue   | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/i18n/index.js                          |   3 +++
 src/i18n/oaI18n.js                         |  12 ++++++++++++
 src/router/index.js                        |   2 ++
 src/router/oaRouter.js                     |  12 ++++++++++++
 src/views/oa/activitiesManageLang.js       | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/oa/activitiesManageList.vue      | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/oa/activitiesTypeManageLang.js   | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/oa/activitiesTypeManageList.vue  | 191 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 17 files changed, 1563 insertions(+), 8 deletions(-)
 create mode 100644 src/api/oa/activitiesManageApi.js
 create mode 100644 src/api/oa/activitiesTypeManageApi.js
 create mode 100644 src/components/oa/addActivitiesType.vue
 create mode 100644 src/components/oa/addActivitiesView.vue
 create mode 100644 src/components/oa/deleteActivities.vue
 create mode 100644 src/components/oa/deleteActivitiesType.vue
 create mode 100644 src/components/oa/editActivitiesType.vue
 create mode 100644 src/components/oa/editActivitiesView.vue
 create mode 100644 src/i18n/oaI18n.js
 create mode 100644 src/router/oaRouter.js
 create mode 100644 src/views/oa/activitiesManageLang.js
 create mode 100644 src/views/oa/activitiesManageList.vue
 create mode 100644 src/views/oa/activitiesTypeManageLang.js
 create mode 100644 src/views/oa/activitiesTypeManageList.vue

diff --git a/src/api/oa/activitiesManageApi.js b/src/api/oa/activitiesManageApi.js
new file mode 100644
index 0000000..a3dfb03
--- /dev/null
+++ b/src/api/oa/activitiesManageApi.js
@@ -0,0 +1,140 @@
+import request from '@/utils/request'
+import { getCommunityId } from '@/api/community/communityApi'
+
+// 获取活动列表
+export function listActivities(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/activities.listActivitiess',
+      method: 'get',
+      params: {
+        ...params,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve({
+        data: res.activitiess,
+        total: res.total
+      })
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 获取活动详情
+export function getActivitiesDetail(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/activities.listActivitiess',
+      method: 'get',
+      params: {
+        ...params,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 添加活动
+export function saveActivities(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/activities.saveActivities',
+      method: 'post',
+      data: {
+        ...data,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 更新活动
+export function updateActivities(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/activities.updateActivities',
+      method: 'post',
+      data: {
+        ...data,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 删除活动
+export function deleteActivities(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/activities.deleteActivities',
+      method: 'post',
+      data: {
+        ...params,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 获取活动类型列表
+export function listActivitiesType(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/activitiesType/queryActivitiesType',
+      method: 'get',
+      params: {
+        ...params,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve({
+        data: res.data
+      })
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 上传图片
+export function uploadImage(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/uploadFile/uploadImage',
+      method: 'post',
+      data,
+      headers: {
+        'Content-Type': 'multipart/form-data'
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/api/oa/activitiesTypeManageApi.js b/src/api/oa/activitiesTypeManageApi.js
new file mode 100644
index 0000000..b1bfede
--- /dev/null
+++ b/src/api/oa/activitiesTypeManageApi.js
@@ -0,0 +1,78 @@
+import request from '@/utils/request'
+import { getCommunityId } from '@/api/community/communityApi'
+
+// 查询活动类型列表
+export function queryActivitiesType(params) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/activitiesType/queryActivitiesType',
+      method: 'get',
+      params: {
+        ...params,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 添加活动类型
+export function saveActivitiesType(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/activitiesType/saveActivitiesType',
+      method: 'post',
+      data: {
+        ...data,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 更新活动类型
+export function updateActivitiesType(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/activitiesType/updateActivitiesType',
+      method: 'post',
+      data: {
+        ...data,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
+
+// 删除活动类型
+export function deleteActivitiesType(data) {
+  return new Promise((resolve, reject) => {
+    request({
+      url: '/activitiesType/deleteActivitiesType',
+      method: 'post',
+      data: {
+        ...data,
+        communityId: getCommunityId()
+      }
+    }).then(response => {
+      const res = response.data
+      resolve(res)
+    }).catch(error => {
+      reject(error)
+    })
+  })
+}
\ No newline at end of file
diff --git a/src/components/admin/AddAdvert.vue b/src/components/admin/AddAdvert.vue
index 5bbe15d..5158566 100644
--- a/src/components/admin/AddAdvert.vue
+++ b/src/components/admin/AddAdvert.vue
@@ -12,33 +12,36 @@
       </el-form-item>
 
       <el-form-item :label="$t('advertManage.add.locationTypeCd')" prop="locationTypeCd">
-        <el-select v-model="form.locationTypeCd" :placeholder="$t('advertManage.add.locationPlaceholder')" style="width: 100%;">
+        <el-select v-model="form.locationTypeCd" :placeholder="$t('advertManage.add.locationPlaceholder')"
+          style="width: 100%;">
           <el-option v-for="item in locationOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('advertManage.add.advertType')" prop="advertType">
-        <el-select v-model="form.advertType" :placeholder="$t('advertManage.add.advertTypePlaceholder')" style="width: 100%;">
+        <el-select v-model="form.advertType" :placeholder="$t('advertManage.add.advertTypePlaceholder')"
+          style="width: 100%;">
           <el-option v-for="item in advertTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('advertManage.add.pageUrl')">
-        <el-input v-model="form.pageUrl" :placeholder="$t('advertManage.add.pageUrlPlaceholder')" style="width: 100%;"/>
+        <el-input v-model="form.pageUrl" :placeholder="$t('advertManage.add.pageUrlPlaceholder')" style="width: 100%;" />
       </el-form-item>
 
       <el-form-item :label="$t('advertManage.add.seq')" prop="seq">
-        <el-input v-model="form.seq" :placeholder="$t('advertManage.add.seqPlaceholder')" style="width: 100%;"/>
+        <el-input v-model="form.seq" :placeholder="$t('advertManage.add.seqPlaceholder')" style="width: 100%;" />
       </el-form-item>
 
       <el-form-item :label="$t('advertManage.add.startTime')" prop="startTime">
         <el-date-picker v-model="form.startTime" type="datetime"
-          :placeholder="$t('advertManage.add.startTimePlaceholder')" value-format="yyyy-MM-dd HH:mm:ss" style="width: 100%;"/>
+          :placeholder="$t('advertManage.add.startTimePlaceholder')" value-format="yyyy-MM-dd HH:mm:ss"
+          style="width: 100%;" />
       </el-form-item>
 
       <el-form-item :label="$t('advertManage.add.endTime')" prop="endTime">
-        <el-date-picker v-model="form.endTime" type="datetime" :placeholder="$t('advertManage.add.endTimePlaceholder')" style="width: 100%;"
-          value-format="yyyy-MM-dd HH:mm:ss" />
+        <el-date-picker v-model="form.endTime" type="datetime" :placeholder="$t('advertManage.add.endTimePlaceholder')"
+          style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" />
       </el-form-item>
 
       <el-form-item :label="$t('advertManage.add.viewType')" prop="viewType">
@@ -83,7 +86,7 @@ export default {
         viewType: '8888',
         adTypeCd: '20000',
         locationObjId: '-1',
-        vedioName:'',
+        vedioName: '',
         photos: []
       },
       rules: {
diff --git a/src/components/oa/addActivitiesType.vue b/src/components/oa/addActivitiesType.vue
new file mode 100644
index 0000000..9249ed7
--- /dev/null
+++ b/src/components/oa/addActivitiesType.vue
@@ -0,0 +1,95 @@
+<template>
+  <el-dialog :title="$t('activitiesTypeManage.add.title')" :visible.sync="visible" width="50%" @close="handleClose">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('activitiesTypeManage.add.typeName')" prop="typeName">
+        <el-input v-model="formData.typeName" :placeholder="$t('activitiesTypeManage.add.typeNamePlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesTypeManage.add.typeDesc')" prop="typeDesc">
+        <el-input v-model="formData.typeDesc" :placeholder="$t('activitiesTypeManage.add.typeDescPlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesTypeManage.add.seq')" prop="seq">
+        <el-input v-model="formData.seq" :placeholder="$t('activitiesTypeManage.add.seqPlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesTypeManage.add.defaultShow')" prop="defaultShow">
+        <el-select v-model="formData.defaultShow" :placeholder="$t('activitiesTypeManage.add.defaultShowPlaceholder')"
+          style="width:100%">
+          <el-option :label="$t('common.yes')" value="Y" />
+          <el-option :label="$t('common.no')" value="N" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">
+        {{ $t('common.cancel') }}
+      </el-button>
+      <el-button type="primary" @click="handleSubmit">
+        {{ $t('common.confirm') }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getCommunityId } from '@/api/community/communityApi'
+import { saveActivitiesType } from '@/api/oa/activitiesTypeManageApi'
+
+export default {
+  name: 'AddActivitiesType',
+  data() {
+    return {
+      visible: false,
+      formData: {
+        typeName: '',
+        typeDesc: '',
+        seq: '',
+        defaultShow: '',
+        communityId: ''
+      },
+      rules: {
+        typeName: [
+          { required: true, message: this.$t('activitiesTypeManage.validate.typeNameRequired'), trigger: 'blur' },
+          { max: 100, message: this.$t('activitiesTypeManage.validate.typeNameMaxLength'), trigger: 'blur' }
+        ],
+        typeDesc: [
+          { max: 500, message: this.$t('activitiesTypeManage.validate.typeDescMaxLength'), trigger: 'blur' }
+        ],
+        seq: [
+          { required: true, message: this.$t('activitiesTypeManage.validate.seqRequired'), trigger: 'blur' },
+        ],
+        defaultShow: [
+          { required: true, message: this.$t('activitiesTypeManage.validate.defaultShowRequired'), trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.visible = true
+      this.formData.communityId = getCommunityId()
+      this.$nextTick(() => {
+        this.$refs.form && this.$refs.form.resetFields()
+      })
+    },
+    handleClose() {
+      this.$refs.form.resetFields()
+    },
+    handleSubmit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            await saveActivitiesType({
+              ...this.formData,
+              seq: Number(this.formData.seq)
+            })
+            this.$message.success(this.$t('activitiesTypeManage.add.success'))
+            this.visible = false
+            this.$emit('success')
+          } catch (error) {
+            this.$message.error(this.$t('activitiesTypeManage.add.error'))
+          }
+        }
+      })
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/oa/addActivitiesView.vue b/src/components/oa/addActivitiesView.vue
new file mode 100644
index 0000000..5d61d3e
--- /dev/null
+++ b/src/components/oa/addActivitiesView.vue
@@ -0,0 +1,141 @@
+<template>
+  <el-dialog :title="$t('activitiesManage.add.title')" :visible.sync="dialogVisible" width="70%" @close="handleClose">
+    <el-form ref="form" :model="form" label-width="120px" :rules="rules">
+      <el-form-item :label="$t('activitiesManage.add.title')" prop="title">
+        <el-input v-model="form.title" :placeholder="$t('activitiesManage.add.titlePlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.add.typeCd')" prop="typeCd">
+        <el-select v-model="form.typeCd" :placeholder="$t('activitiesManage.add.typeCdPlaceholder')" style="width:100%">
+          <el-option v-for="item in typeCds" :key="item.typeCd" :label="item.typeName" :value="item.typeCd" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.add.isMoreCommunity')">
+        <el-select v-model="form.isMoreCommunity" :placeholder="$t('activitiesManage.add.isMoreCommunityPlaceholder')"
+          style="width:100%">
+          <el-option :label="$t('common.yes')" value="Y" />
+          <el-option :label="$t('common.no')" value="N" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.add.headerImg')" prop="headerImg">
+        <upload-image-url ref="uploadImage" :limit="1" @notifyUploadCoverImage="handleImageChange" />
+
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.add.startTime')" prop="startTime">
+        <el-date-picker v-model="form.startTime" type="datetime"
+          :placeholder="$t('activitiesManage.add.startTimePlaceholder')" style="width:100%"
+          value-format="yyyy-MM-dd HH:mm:ss" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.add.endTime')" prop="endTime">
+        <el-date-picker v-model="form.endTime" type="datetime"
+          :placeholder="$t('activitiesManage.add.endTimePlaceholder')" style="width:100%"
+          value-format="yyyy-MM-dd HH:mm:ss" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.add.context')" prop="context">
+        <rich-text-editor ref="richTextEditor" v-model="form.context" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">{{ $t('common.cancel') }}</el-button>
+      <el-button type="primary" @click="handleSubmit">{{ $t('common.submit') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getCommunityId } from '@/api/community/communityApi'
+import { saveActivities, listActivitiesType } from '@/api/oa/activitiesManageApi'
+import UploadImageUrl from '@/components/upload/UploadImageUrl'
+import RichTextEditor from "@/components/editor/RichTextEditor";
+
+export default {
+  name: 'AddActivitiesView',
+  components: {
+    UploadImageUrl,
+    RichTextEditor
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      form: {
+        title: '',
+        typeCd: '',
+        headerImg: '',
+        context: '',
+        startTime: '',
+        endTime: '',
+        isMoreCommunity: '',
+        communityId: ''
+      },
+      typeCds: [],
+      rules: {
+        title: [
+          { required: true, message: this.$t('activitiesManage.validate.titleRequired'), trigger: 'blur' },
+          { max: 200, message: this.$t('activitiesManage.validate.titleMaxLength'), trigger: 'blur' }
+        ],
+        typeCd: [
+          { required: true, message: this.$t('activitiesManage.validate.typeCdRequired'), trigger: 'change' }
+        ],
+        headerImg: [
+          { required: true, message: this.$t('activitiesManage.validate.headerImgRequired'), trigger: 'change' }
+        ],
+        context: [
+          { required: true, message: this.$t('activitiesManage.validate.contextRequired'), trigger: 'blur' }
+        ],
+        startTime: [
+          { required: true, message: this.$t('activitiesManage.validate.startTimeRequired'), trigger: 'change' }
+        ],
+        endTime: [
+          { required: true, message: this.$t('activitiesManage.validate.endTimeRequired'), trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    open() {
+      this.dialogVisible = true
+      this.$nextTick(() => {
+        this.$refs.form && this.$refs.form.resetFields()
+        this.$refs.uploadImage && this.$refs.uploadImage.clearImages()
+        this.loadActivitiesType()
+      })
+    },
+    async loadActivitiesType() {
+      try {
+        const params = {
+          page: 1,
+          row: 50,
+          communityId: getCommunityId()
+        }
+        const { data } = await listActivitiesType(params)
+        this.typeCds = data
+      } catch (error) {
+        console.error('获取活动类型失败:', error)
+      }
+    },
+    handleImageChange(images) {
+      this.form.headerImg = images.length > 0 ? images[0] : ''
+    },
+    async handleSubmit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            this.form.communityId = getCommunityId()
+            await saveActivities(this.form)
+            this.$message.success(this.$t('common.saveSuccess'))
+            this.dialogVisible = false
+            this.$emit('success')
+          } catch (error) {
+            console.error('保存活动失败:', error)
+          }
+        }
+      })
+    },
+    handleClose() {
+      if (this.$refs.richTextEditor) {
+        this.$refs.richTextEditor.clear();
+      }
+      this.$refs.form.resetFields()
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/oa/deleteActivities.vue b/src/components/oa/deleteActivities.vue
new file mode 100644
index 0000000..615e9b8
--- /dev/null
+++ b/src/components/oa/deleteActivities.vue
@@ -0,0 +1,76 @@
+<template>
+  <el-dialog
+    :title="$t('activitiesManage.delete.title')"
+    :visible.sync="dialogVisible"
+    width="30%"
+    @close="handleClose"
+  >
+    <div class="delete-content">
+      <i class="el-icon-warning warning-icon"></i>
+      <span>{{ $t('activitiesManage.delete.confirmText') }}</span>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">{{ $t('common.cancel') }}</el-button>
+      <el-button type="primary" @click="handleConfirm">{{ $t('common.confirm') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getCommunityId } from '@/api/community/communityApi'
+import { deleteActivities } from '@/api/oa/activitiesManageApi'
+
+export default {
+  name: 'DeleteActivities',
+  data() {
+    return {
+      dialogVisible: false,
+      activitiesId: ''
+    }
+  },
+  methods: {
+    open(row) {
+      this.activitiesId = row.activitiesId
+      this.dialogVisible = true
+    },
+    async handleConfirm() {
+      try {
+        const params = {
+          activitiesId: this.activitiesId,
+          communityId: getCommunityId()
+        }
+        await deleteActivities(params)
+        this.$message.success(this.$t('common.deleteSuccess'))
+        this.dialogVisible = false
+        this.$emit('success')
+      } catch (error) {
+        console.error('删除活动失败:', error)
+        this.$message.error(this.$t('common.deleteFailed'))
+      }
+    },
+    handleClose() {
+      this.activitiesId = ''
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.delete-content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 20px 0;
+  font-size: 16px;
+  
+  .warning-icon {
+    color: #E6A23C;
+    font-size: 24px;
+    margin-right: 10px;
+  }
+}
+
+.dialog-footer {
+  text-align: right;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/oa/deleteActivitiesType.vue b/src/components/oa/deleteActivitiesType.vue
new file mode 100644
index 0000000..27948fd
--- /dev/null
+++ b/src/components/oa/deleteActivitiesType.vue
@@ -0,0 +1,73 @@
+<template>
+  <el-dialog
+    :title="$t('activitiesTypeManage.delete.title')"
+    :visible.sync="visible"
+    width="30%"
+    @close="handleClose"
+  >
+    <div class="delete-content">
+      <i class="el-icon-warning" style="color:#E6A23C;font-size:24px;"></i>
+      <span style="margin-left:10px;">{{ $t('activitiesTypeManage.delete.confirm') }}</span>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">
+        {{ $t('common.cancel') }}
+      </el-button>
+      <el-button type="primary" @click="handleConfirm">
+        {{ $t('common.confirm') }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getCommunityId } from '@/api/community/communityApi'
+import { deleteActivitiesType } from '@/api/oa/activitiesTypeManageApi'
+
+export default {
+  name: 'DeleteActivitiesType',
+  data() {
+    return {
+      visible: false,
+      deleteData: {
+        typeCd: '',
+        communityId: ''
+      }
+    }
+  },
+  methods: {
+    open(row) {
+      this.visible = true
+      this.deleteData = {
+        typeCd: row.typeCd,
+        communityId: getCommunityId()
+      }
+    },
+    handleClose() {
+      this.deleteData = {
+        typeCd: '',
+        communityId: ''
+      }
+    },
+    async handleConfirm() {
+      try {
+        await deleteActivitiesType(this.deleteData)
+        this.$message.success(this.$t('activitiesTypeManage.delete.success'))
+        this.visible = false
+        this.$emit('success')
+      } catch (error) {
+        this.$message.error(this.$t('activitiesTypeManage.delete.error'))
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.delete-content {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 20px 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/oa/editActivitiesType.vue b/src/components/oa/editActivitiesType.vue
new file mode 100644
index 0000000..1fdab62
--- /dev/null
+++ b/src/components/oa/editActivitiesType.vue
@@ -0,0 +1,105 @@
+<template>
+  <el-dialog :title="$t('activitiesTypeManage.edit.title')" :visible.sync="visible" width="50%" @close="handleClose">
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px">
+      <el-form-item :label="$t('activitiesTypeManage.edit.typeCd')" prop="typeCd">
+        <el-input v-model="formData.typeCd" disabled />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesTypeManage.edit.typeName')" prop="typeName">
+        <el-input v-model="formData.typeName" :placeholder="$t('activitiesTypeManage.edit.typeNamePlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesTypeManage.edit.typeDesc')" prop="typeDesc">
+        <el-input v-model="formData.typeDesc" :placeholder="$t('activitiesTypeManage.edit.typeDescPlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesTypeManage.edit.seq')" prop="seq">
+        <el-input v-model="formData.seq" :placeholder="$t('activitiesTypeManage.edit.seqPlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesTypeManage.edit.defaultShow')" prop="defaultShow">
+        <el-select v-model="formData.defaultShow" :placeholder="$t('activitiesTypeManage.edit.defaultShowPlaceholder')"
+          style="width:100%">
+          <el-option :label="$t('common.yes')" value="Y" />
+          <el-option :label="$t('common.no')" value="N" />
+        </el-select>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">
+        {{ $t('common.cancel') }}
+      </el-button>
+      <el-button type="primary" @click="handleSubmit">
+        {{ $t('common.confirm') }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getCommunityId } from '@/api/community/communityApi'
+import { updateActivitiesType } from '@/api/oa/activitiesTypeManageApi'
+
+export default {
+  name: 'EditActivitiesType',
+  data() {
+    return {
+      visible: false,
+      formData: {
+        typeCd: '',
+        typeName: '',
+        typeDesc: '',
+        seq: '',
+        defaultShow: '',
+        communityId: ''
+      },
+      rules: {
+        typeCd: [
+          { required: true, message: this.$t('activitiesTypeManage.validate.typeCdRequired'), trigger: 'blur' }
+        ],
+        typeName: [
+          { required: true, message: this.$t('activitiesTypeManage.validate.typeNameRequired'), trigger: 'blur' },
+          { max: 100, message: this.$t('activitiesTypeManage.validate.typeNameMaxLength'), trigger: 'blur' }
+        ],
+        typeDesc: [
+          { max: 500, message: this.$t('activitiesTypeManage.validate.typeDescMaxLength'), trigger: 'blur' }
+        ],
+        seq: [
+          { required: true, message: this.$t('activitiesTypeManage.validate.seqRequired'), trigger: 'blur' },
+        ],
+        defaultShow: [
+          { required: true, message: this.$t('activitiesTypeManage.validate.defaultShowRequired'), trigger: 'change' }
+        ]
+      }
+    }
+  },
+  methods: {
+    open(row) {
+      this.visible = true
+      this.formData = {
+        ...row,
+        communityId: getCommunityId()
+      }
+      this.$nextTick(() => {
+        this.$refs.form && this.$refs.form.clearValidate()
+      })
+    },
+    handleClose() {
+      this.$refs.form.resetFields()
+    },
+    handleSubmit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            await updateActivitiesType({
+              ...this.formData,
+              seq: Number(this.formData.seq)
+            })
+            this.$message.success(this.$t('activitiesTypeManage.edit.success'))
+            this.visible = false
+            this.$emit('success')
+          } catch (error) {
+            this.$message.error(this.$t('activitiesTypeManage.edit.error'))
+          }
+        }
+      })
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/components/oa/editActivitiesView.vue b/src/components/oa/editActivitiesView.vue
new file mode 100644
index 0000000..f7575c8
--- /dev/null
+++ b/src/components/oa/editActivitiesView.vue
@@ -0,0 +1,149 @@
+<template>
+  <el-dialog :title="$t('activitiesManage.edit.title')" :visible.sync="dialogVisible" width="70%" @close="handleClose">
+    <el-form ref="form" :model="form" label-width="120px" :rules="rules">
+      <el-form-item :label="$t('activitiesManage.edit.title')" prop="title">
+        <el-input v-model="form.title" :placeholder="$t('activitiesManage.edit.titlePlaceholder')" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.edit.typeCd')" prop="typeCd">
+        <el-select v-model="form.typeCd" :placeholder="$t('activitiesManage.edit.typeCdPlaceholder')" style="width:100%">
+          <el-option v-for="item in typeCds" :key="item.typeCd" :label="item.typeName" :value="item.typeCd" />
+        </el-select>
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.edit.headerImg')" prop="headerImg">
+        <upload-image-url ref="uploadImage" :limit="1" @notifyUploadCoverImage="handleImageChange" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.edit.startTime')" prop="startTime">
+        <el-date-picker v-model="form.startTime" type="datetime"
+          :placeholder="$t('activitiesManage.edit.startTimePlaceholder')" style="width:100%"
+          value-format="yyyy-MM-dd HH:mm:ss" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.edit.endTime')" prop="endTime">
+        <el-date-picker v-model="form.endTime" type="datetime"
+          :placeholder="$t('activitiesManage.edit.endTimePlaceholder')" style="width:100%"
+          value-format="yyyy-MM-dd HH:mm:ss" />
+      </el-form-item>
+      <el-form-item :label="$t('activitiesManage.edit.context')" prop="context">
+        <rich-text-editor ref="richTextEditor" v-model="form.context" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">{{ $t('common.cancel') }}</el-button>
+      <el-button type="primary" @click="handleSubmit">{{ $t('common.save') }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getCommunityId } from '@/api/community/communityApi'
+import { updateActivities, getActivitiesDetail, listActivitiesType } from '@/api/oa/activitiesManageApi'
+import UploadImageUrl from '@/components/upload/UploadImageUrl'
+import RichTextEditor from "@/components/editor/RichTextEditor";
+
+export default {
+  name: 'EditActivitiesView',
+  components: {
+    UploadImageUrl,
+    RichTextEditor
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      form: {
+        activitiesId: '',
+        title: '',
+        typeCd: '',
+        headerImg: '',
+        context: '',
+        startTime: '',
+        endTime: '',
+        communityId: ''
+      },
+      typeCds: [],
+      rules: {
+        title: [
+          { required: true, message: this.$t('activitiesManage.validate.titleRequired'), trigger: 'blur' },
+          { max: 200, message: this.$t('activitiesManage.validate.titleMaxLength'), trigger: 'blur' }
+        ],
+        typeCd: [
+          { required: true, message: this.$t('activitiesManage.validate.typeCdRequired'), trigger: 'change' }
+        ],
+        headerImg: [
+          { required: true, message: this.$t('activitiesManage.validate.headerImgRequired'), trigger: 'change' }
+        ],
+        context: [
+          { required: true, message: this.$t('activitiesManage.validate.contextRequired'), trigger: 'blur' }
+        ],
+        startTime: [
+          { required: true, message: this.$t('activitiesManage.validate.startTimeRequired'), trigger: 'change' }
+        ],
+        endTime: [
+          { required: true, message: this.$t('activitiesManage.validate.endTimeRequired'), trigger: 'change' }
+        ],
+        activitiesId: [
+          { required: true, message: this.$t('activitiesManage.validate.activitiesIdRequired'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    open(row) {
+      this.dialogVisible = true
+      this.$nextTick(async () => {
+        this.$refs.form && this.$refs.form.resetFields()
+        this.loadActivitiesType()
+        await this.loadActivitiesDetail(row.activitiesId)
+      })
+    },
+    async loadActivitiesType() {
+      try {
+        const params = {
+          page: 1,
+          row: 50,
+          communityId: getCommunityId()
+        }
+        const { data } = await listActivitiesType(params)
+        this.typeCds = data
+      } catch (error) {
+        console.error('获取活动类型失败:', error)
+      }
+    },
+    async loadActivitiesDetail(activitiesId) {
+      try {
+        const params = {
+          activitiesId,
+          page: 1,
+          row: 50,
+          communityId: getCommunityId()
+        }
+        const {activitiess} = await getActivitiesDetail(params)
+        this.form = { ...activitiess[0] }
+        this.$refs.uploadImage.setImages([activitiess[0].headerImg])
+        this.$refs.richTextEditor.setContent(activitiess[0].context)
+      } catch (error) {
+        console.error('获取活动详情失败:', error)
+      }
+    },
+    handleImageChange(images) {
+      this.form.headerImg = images.length > 0 ? images[0] : ''
+    },
+    async handleSubmit() {
+      this.$refs.form.validate(async valid => {
+        if (valid) {
+          try {
+            this.form.communityId = getCommunityId()
+            await updateActivities(this.form)
+            this.$message.success(this.$t('common.saveSuccess'))
+            this.dialogVisible = false
+            this.$emit('success')
+          } catch (error) {
+            console.error('更新活动失败:', error)
+          }
+        }
+      })
+    },
+    handleClose() {
+      this.$refs.form.resetFields()
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/i18n/index.js b/src/i18n/index.js
index 7bbdd76..84067dd 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -206,6 +206,7 @@ import { messages as equipmentAccountDetailMessages } from '../views/machine/equ
 import { messages as printEquipmentAccountLabelMessages } from '../views/resource/printEquipmentAccountLabelLang'
 import {messages as inspectioni18n} from './inspectionI18n'
 import {messages as machineI18n} from './machineI18n'
+import {messages as oaI18n} from './oaI18n'
 
 Vue.use(VueI18n)
 
@@ -416,6 +417,7 @@ const messages = {
     ...printEquipmentAccountLabelMessages.en,
     ...inspectioni18n.en,
     ...machineI18n.en,
+    ...oaI18n.en,
   },
   zh: {
     ...loginMessages.zh,
@@ -622,6 +624,7 @@ const messages = {
      ...printEquipmentAccountLabelMessages.zh,
      ...inspectioni18n.zh,
      ...machineI18n.zh,
+     ...oaI18n.zh,
   }
 }
 
diff --git a/src/i18n/oaI18n.js b/src/i18n/oaI18n.js
new file mode 100644
index 0000000..40878cc
--- /dev/null
+++ b/src/i18n/oaI18n.js
@@ -0,0 +1,12 @@
+import { messages as activitiesTypeManageMessages } from '../views/oa/activitiesTypeManageLang'
+import { messages as activitiesManageMessages } from '../views/oa/activitiesManageLang'
+export const messages ={
+    en:{
+        ...activitiesTypeManageMessages.en,
+        ...activitiesManageMessages.en,
+    },
+    zh:{    
+        ...activitiesTypeManageMessages.zh, 
+        ...activitiesManageMessages.zh,  
+    }
+}
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 7634323..4b954f2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,6 +5,7 @@ import Login from '@/views/user/login/Login.vue'
 import printEquipmentAccountLabel from '@/views/resource/printEquipmentAccountLabelList.vue'
 import inspectionRouter from './inspectionRouter'
 import machineRouter from './machineRouter'
+import oaRouter from './oaRouter'
 
 Vue.use(VueRouter)
 
@@ -926,6 +927,7 @@ const routes = [
      
       ...inspectionRouter,
       ...machineRouter,
+      ...oaRouter,
       // 其他子路由可以在这里添加
     ]
   },
diff --git a/src/router/oaRouter.js b/src/router/oaRouter.js
new file mode 100644
index 0000000..56eae27
--- /dev/null
+++ b/src/router/oaRouter.js
@@ -0,0 +1,12 @@
+export default [
+    {
+        path: '/pages/property/activitiesTypeManage',
+        name: '/pages/property/activitiesTypeManage',
+        component: () => import('@/views/oa/activitiesTypeManageList.vue')
+    },
+    {
+        path:'/pages/property/activitiesManage',
+        name:'/pages/property/activitiesManage',
+        component: () => import('@/views/oa/activitiesManageList.vue')
+        },
+]
\ No newline at end of file
diff --git a/src/views/oa/activitiesManageLang.js b/src/views/oa/activitiesManageLang.js
new file mode 100644
index 0000000..5014676
--- /dev/null
+++ b/src/views/oa/activitiesManageLang.js
@@ -0,0 +1,128 @@
+export const messages = {
+  en: {
+    activitiesManage: {
+      search: {
+        title: 'Search Conditions',
+        activitiesId: 'Please enter activity ID',
+        titlePlaceholder: 'Please enter title',
+        typeCd: 'Please select activity type',
+        staffName: 'Please enter publisher name'
+      },
+      list: {
+        title: 'Activity List'
+      },
+      table: {
+        activitiesId: 'Activity ID',
+        title: 'Title',
+        typeCd: 'Type',
+        startTime: 'Start Time',
+        endTime: 'End Time',
+        userName: 'Publisher'
+      },
+      add: {
+        title: 'Add Activity',
+        titlePlaceholder: 'Required, please enter title',
+        typeCd: 'Activity Type',
+        startTime: 'start time',
+        endTime: 'end time',
+        typeCdPlaceholder: 'Required, please select type',
+        isMoreCommunity: 'Multi-community',
+        isMoreCommunityPlaceholder: 'Please select if multi-community',
+        headerImg: 'Header Image (800*595)',
+        startTimePlaceholder: 'Required, please enter start time',
+        endTimePlaceholder: 'Required, please enter end time',
+        context: 'Content'
+      },
+      edit: {
+        title: 'Edit Activity',
+        titlePlaceholder: 'Required, please enter title',
+        typeCd: 'Activity Type',
+        startTime: 'start time',
+        endTime: 'end time',
+        typeCdPlaceholder: 'Required, please select type',
+        headerImg: 'Header Image (800*595)',
+        startTimePlaceholder: 'Required, please enter start time',
+        endTimePlaceholder: 'Required, please enter end time',
+        context: 'Content'
+      },
+      delete: {
+        title: 'Confirm Operation',
+        confirmText: 'Are you sure to delete this activity?'
+      },
+      validate: {
+        titleRequired: 'Title is required',
+        titleMaxLength: 'Title cannot exceed 200 characters',
+        typeCdRequired: 'Type is required',
+        headerImgRequired: 'Header image is required',
+        contextRequired: 'Content is required',
+        startTimeRequired: 'Start time is required',
+        endTimeRequired: 'End time is required',
+        activitiesIdRequired: 'Activity ID is required',
+        imageSize: 'Image size cannot exceed 2MB'
+      }
+    }
+  },
+  zh: {
+    activitiesManage: {
+      search: {
+        title: '查询条件',
+        activitiesId: '请输入活动ID',
+        titlePlaceholder: '请输入标题',
+        typeCd: '请选择活动类型',
+        staffName: '请输入发布人名称'
+      },
+      list: {
+        title: '活动列表'
+      },
+      table: {
+        activitiesId: '活动ID',
+        title: '标题',
+        typeCd: '类型',
+        startTime: '开始时间',
+        endTime: '结束时间',
+        userName: '发布人'
+      },
+      add: {
+        title: '添加活动',
+        titlePlaceholder: '必填，请输入标题',
+        typeCd: '类型',
+        startTime: '开始时间',
+        endTime: '结束时间',
+        typeCdPlaceholder: '必填，请选择类型',
+        isMoreCommunity: '多小区',
+        isMoreCommunityPlaceholder: '请选择是否多小区',
+        headerImg: '头部照片(800*595)',
+        startTimePlaceholder: '必填，请输入开始时间',
+        endTimePlaceholder: '必填，请输入结束时间',
+        context: '内容'
+      },
+      edit: {
+        title: '编辑活动',
+        titlePlaceholder: '必填，请输入标题',
+        typeCd: '类型',
+        typeCdPlaceholder: '必填，请选择类型',
+        headerImg: '头部照片(800*595)',
+        startTimePlaceholder: '必填，请输入开始时间',
+        endTimePlaceholder: '必填，请输入结束时间',
+        startTime: '开始时间',
+        endTime: '结束时间',
+        context: '内容'
+      },
+      delete: {
+        title: '确认操作',
+        confirmText: '确认删除该活动吗？'
+      },
+      validate: {
+        titleRequired: '标题不能为空',
+        titleMaxLength: '标题不能超过200个字符',
+        typeCdRequired: '类型不能为空',
+        headerImgRequired: '头部照片不能为空',
+        contextRequired: '内容不能为空',
+        startTimeRequired: '开始时间不能为空',
+        endTimeRequired: '结束时间不能为空',
+        activitiesIdRequired: '活动ID不能为空',
+        imageSize: '图片大小不能超过2MB'
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/oa/activitiesManageList.vue b/src/views/oa/activitiesManageList.vue
new file mode 100644
index 0000000..116c1a2
--- /dev/null
+++ b/src/views/oa/activitiesManageList.vue
@@ -0,0 +1,213 @@
+<template>
+  <div class="activities-manage-container animated fadeInRight">
+    <el-card class="box-card">
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('activitiesManage.search.title') }}</span>
+        <el-button type="text" style="float: right; padding: 3px 0" @click="_moreCondition">
+          {{ activitiesManageInfo.moreCondition ? $t('common.hide') : $t('common.more') }}
+        </el-button>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-input v-model="activitiesManageInfo.conditions.activitiesId"
+            :placeholder="$t('activitiesManage.search.activitiesId')" clearable />
+        </el-col>
+        <el-col :span="8">
+          <el-input v-model="activitiesManageInfo.conditions.title" :placeholder="$t('activitiesManage.search.title')"
+            clearable />
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="activitiesManageInfo.conditions.typeCd" :placeholder="$t('activitiesManage.search.typeCd')"
+            style="width:100%">
+            <el-option v-for="item in activitiesManageInfo.typeCds" :key="item.typeCd" :label="item.typeName"
+              :value="item.typeCd" />
+          </el-select>
+        </el-col>
+        <el-col :span="4">
+          <el-button type="primary" @click="_queryActivitiesMethod">
+            <i class="el-icon-search"></i>
+            {{ $t('common.search') }}
+          </el-button>
+          <el-button @click="_resetActivitiesMethod">
+            <i class="el-icon-refresh"></i>
+            {{ $t('common.reset') }}
+          </el-button>
+        </el-col>
+      </el-row>
+      <el-row v-if="activitiesManageInfo.moreCondition" :gutter="20" style="margin-top:15px">
+        <el-col :span="6">
+          <el-input v-model="activitiesManageInfo.conditions.staffName"
+            :placeholder="$t('activitiesManage.search.staffName')" clearable />
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <el-card class="box-card" style="margin-top:20px">
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('activitiesManage.list.title') }}</span>
+        <el-button type="primary" size="small" @click="_openAddActivitiesModal">
+          <i class="el-icon-plus"></i>
+          {{ $t('common.add') }}
+        </el-button>
+      </div>
+      <el-table :data="activitiesManageInfo.activitiess" border style="width: 100%">
+        <el-table-column prop="activitiesId" :label="$t('activitiesManage.table.activitiesId')" align="center" />
+        <el-table-column prop="title" :label="$t('activitiesManage.table.title')" align="center" />
+        <el-table-column prop="typeCdName" :label="$t('activitiesManage.table.typeCd')" align="center" />
+        <el-table-column prop="startTime" :label="$t('activitiesManage.table.startTime')" align="center" />
+        <el-table-column prop="endTime" :label="$t('activitiesManage.table.endTime')" align="center" />
+        <el-table-column prop="userName" :label="$t('activitiesManage.table.userName')" align="center" />
+        <el-table-column :label="$t('common.operation')" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button size="mini" @click="_openEditActivitiesModel(scope.row)">
+              {{ $t('common.edit') }}
+            </el-button>
+            <el-button size="mini" type="danger" @click="_openDeleteActivitiesModel(scope.row)">
+              {{ $t('common.delete') }}
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination :current-page.sync="page.current" :page-sizes="[10, 20, 30, 50]" :page-size="page.size"
+        :total="page.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" style="margin-top:20px;text-align:right" />
+    </el-card>
+
+    <add-activities-view ref="addActivitiesView" @success="handleSuccess" />
+    <edit-activities-view ref="editActivitiesView" @success="handleSuccess" />
+    <delete-activities ref="deleteActivities" @success="handleSuccess" />
+  </div>
+</template>
+
+<script>
+import { getCommunityId } from '@/api/community/communityApi'
+import { listActivities, listActivitiesType } from '@/api/oa/activitiesManageApi'
+import AddActivitiesView from '@/components/oa/addActivitiesView'
+import EditActivitiesView from '@/components/oa/editActivitiesView'
+import DeleteActivities from '@/components/oa/deleteActivities'
+
+export default {
+  name: 'ActivitiesManageList',
+  components: {
+    AddActivitiesView,
+    EditActivitiesView,
+    DeleteActivities
+  },
+  data() {
+    return {
+      activitiesManageInfo: {
+        activitiess: [],
+        total: 0,
+        records: 1,
+        moreCondition: false,
+        title: '',
+        typeCds: [],
+        conditions: {
+          title: '',
+          typeCd: '',
+          staffName: '',
+          activitiesId: '',
+          endTimeFlag: '1',
+          page: 1,
+          row: 10,
+          communityId: ''
+        }
+      },
+      page: {
+        current: 1,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+    this.communityId = getCommunityId()
+    this.activitiesManageInfo.conditions.communityId = this.communityId
+    this._listActivitiess()
+    this._loadActivitiesType()
+  },
+  methods: {
+    async _listActivitiess() {
+      try {
+        const params = {
+          ...this.activitiesManageInfo.conditions,
+          page: this.page.current,
+          row: this.page.size
+        }
+        const { data, total } = await listActivities(params)
+        this.activitiesManageInfo.activitiess = data
+        this.page.total = total
+      } catch (error) {
+        console.error('获取活动列表失败:', error)
+      }
+    },
+    async _loadActivitiesType() {
+      try {
+        const params = {
+          page: 1,
+          row: 50,
+          communityId: this.communityId
+        }
+        const { data } = await listActivitiesType(params)
+        this.activitiesManageInfo.typeCds = data
+      } catch (error) {
+        console.error('获取活动类型失败:', error)
+      }
+    },
+    _openAddActivitiesModal() {
+      this.$refs.addActivitiesView.open()
+    },
+    _openEditActivitiesModel(row) {
+      this.$refs.editActivitiesView.open(row)
+    },
+    _openDeleteActivitiesModel(row) {
+      this.$refs.deleteActivities.open(row)
+    },
+    _queryActivitiesMethod() {
+      this.page.current = 1
+      this._listActivitiess()
+    },
+    _resetActivitiesMethod() {
+      this.activitiesManageInfo.conditions = {
+        title: '',
+        typeCd: '',
+        staffName: '',
+        activitiesId: '',
+        endTimeFlag: '1',
+        page: 1,
+        row: 10,
+        communityId: this.communityId
+      }
+      this._listActivitiess()
+    },
+    _moreCondition() {
+      this.activitiesManageInfo.moreCondition = !this.activitiesManageInfo.moreCondition
+    },
+    handleSuccess() {
+      this._listActivitiess()
+    },
+    handleSizeChange(val) {
+      this.page.size = val
+      this._listActivitiess()
+    },
+    handleCurrentChange(val) {
+      this.page.current = val
+      this._listActivitiess()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.activities-manage-container {
+  padding: 20px;
+
+  .box-card {
+    margin-bottom: 20px;
+  }
+
+  .no_display {
+    display: none;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/oa/activitiesTypeManageLang.js b/src/views/oa/activitiesTypeManageLang.js
new file mode 100644
index 0000000..0fc59c4
--- /dev/null
+++ b/src/views/oa/activitiesTypeManageLang.js
@@ -0,0 +1,134 @@
+export const messages = {
+  en: {
+    activitiesTypeManage: {
+      search: {
+        title: 'Search Conditions',
+        typeCd: 'Type Code',
+        typeName: 'Type Name',
+        defaultShow: 'Mobile Display',
+        all: 'All',
+        yes: 'Yes',
+        no: 'No'
+      },
+      list: {
+        title: 'Information Categories'
+      },
+      table: {
+        typeCd: 'Type Code',
+        typeName: 'Type Name',
+        typeDesc: 'Type Description',
+        seq: 'Display Order',
+        defaultShow: 'Mobile Display'
+      },
+      add: {
+        title: 'Add Category',
+        typeName: 'Type Name',
+        typeNamePlaceholder: 'Required, please enter type name',
+        typeDesc: 'Type Description',
+        typeDescPlaceholder: 'Optional, please enter type description',
+        seq: 'Display Order',
+        seqPlaceholder: 'Required, please enter display order',
+        defaultShow: 'Mobile Display',
+        defaultShowPlaceholder: 'Required, please select mobile display',
+        success: 'Add successfully',
+        error: 'Add failed'
+      },
+      edit: {
+        title: 'Edit Category',
+        typeCd: 'Type Code',
+        typeName: 'Type Name',
+        typeNamePlaceholder: 'Required, please enter type name',
+        typeDesc: 'Type Description',
+        typeDescPlaceholder: 'Optional, please enter type description',
+        seq: 'Display Order',
+        seqPlaceholder: 'Required, please enter display order',
+        defaultShow: 'Mobile Display',
+        defaultShowPlaceholder: 'Required, please select mobile display',
+        success: 'Edit successfully',
+        error: 'Edit failed'
+      },
+      delete: {
+        title: 'Delete Confirmation',
+        confirm: 'Are you sure to delete this category?',
+        success: 'Delete successfully',
+        error: 'Delete failed'
+      },
+      validate: {
+        typeCdRequired: 'Type code is required',
+        typeNameRequired: 'Type name is required',
+        typeNameMaxLength: 'Type name cannot exceed 100 characters',
+        typeDescMaxLength: 'Type description cannot exceed 500 characters',
+        seqRequired: 'Display order is required',
+        seqNumber: 'Display order must be a number',
+        defaultShowRequired: 'Mobile display is required'
+      },
+      fetchError: 'Failed to fetch data'
+    }
+  },
+  zh: {
+    activitiesTypeManage: {
+      search: {
+        title: '查询条件',
+        typeCd: '大类编码',
+        typeName: '大类名称',
+        defaultShow: '手机显示',
+        all: '全部',
+        yes: '是',
+        no: '否'
+      },
+      list: {
+        title: '信息大类'
+      },
+      table: {
+        typeCd: '大类编码',
+        typeName: '大类名称',
+        typeDesc: '大类描述',
+        seq: '显示序号',
+        defaultShow: '手机显示'
+      },
+      add: {
+        title: '添加大类',
+        typeName: '大类名称',
+        typeNamePlaceholder: '必填，请填写大类名称',
+        typeDesc: '大类描述',
+        typeDescPlaceholder: '选填，请填写大类描述',
+        seq: '显示序号',
+        seqPlaceholder: '必填，请填写显示序号',
+        defaultShow: '手机显示',
+        defaultShowPlaceholder: '必填，请选择是否手机显示',
+        success: '添加成功',
+        error: '添加失败'
+      },
+      edit: {
+        title: '修改大类',
+        typeCd: '大类编码',
+        typeName: '大类名称',
+        typeNamePlaceholder: '必填，请填写大类名称',
+        typeDesc: '大类描述',
+        typeDescPlaceholder: '选填，请填写大类描述',
+        seq: '显示序号',
+        seqPlaceholder: '必填，请填写显示序号',
+        defaultShow: '手机显示',
+        defaultShowPlaceholder: '必填，请选择是否显示',
+        success: '修改成功',
+        error: '修改失败'
+      },
+      delete: {
+        title: '删除确认',
+        confirm: '确定删除信息大类？',
+        success: '删除成功',
+        error: '删除失败'
+      },
+      validate: {
+        typeCdRequired: '大类编码不能为空',
+        typeNameRequired: '大类名称不能为空',
+        typeNameMaxLength: '大类名称超过100位',
+        typeDescMaxLength: '描述超过500位',
+        seqRequired: '显示序号不能为空',
+        seqNumber: '显示序号不是有效数字',
+        defaultShowRequired: '是否显示不能为空'
+      },
+      fetchError: '获取数据失败'
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/views/oa/activitiesTypeManageList.vue b/src/views/oa/activitiesTypeManageList.vue
new file mode 100644
index 0000000..ec75fda
--- /dev/null
+++ b/src/views/oa/activitiesTypeManageList.vue
@@ -0,0 +1,191 @@
+<template>
+  <div class="activities-type-manage-container">
+    <!-- 查询条件 -->
+    <el-card class="search-wrapper">
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('activitiesTypeManage.search.title') }}</span>
+      </div>
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-input v-model="searchForm.typeCd" :placeholder="$t('activitiesTypeManage.search.typeCd')" clearable />
+        </el-col>
+        <el-col :span="6">
+          <el-input v-model="searchForm.typeName" :placeholder="$t('activitiesTypeManage.search.typeName')" clearable />
+        </el-col>
+        <el-col :span="6">
+          <el-select v-model="searchForm.defaultShow" :placeholder="$t('activitiesTypeManage.search.defaultShow')"
+            style="width:100%">
+            <el-option :label="$t('activitiesTypeManage.search.all')" value="" />
+            <el-option :label="$t('activitiesTypeManage.search.yes')" value="Y" />
+            <el-option :label="$t('activitiesTypeManage.search.no')" value="N" />
+          </el-select>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" @click="handleSearch">
+            {{ $t('common.search') }}
+          </el-button>
+          <el-button @click="handleReset">
+            {{ $t('common.reset') }}
+          </el-button>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <!-- 列表 -->
+    <el-card class="list-wrapper">
+      <div slot="header" class="flex justify-between">
+        <span>{{ $t('activitiesTypeManage.list.title') }}</span>
+        <el-button type="primary" style="float: right;" @click="handleAdd">
+          {{ $t('common.add') }}
+        </el-button>
+      </div>
+
+      <el-table v-loading="loading" :data="tableData" border style="width: 100%">
+        <el-table-column prop="typeCd" :label="$t('activitiesTypeManage.table.typeCd')" align="center" />
+        <el-table-column prop="typeName" :label="$t('activitiesTypeManage.table.typeName')" align="center" />
+        <el-table-column prop="typeDesc" :label="$t('activitiesTypeManage.table.typeDesc')" align="center" />
+        <el-table-column prop="seq" :label="$t('activitiesTypeManage.table.seq')" align="center" />
+        <el-table-column prop="defaultShow" :label="$t('activitiesTypeManage.table.defaultShow')" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.defaultShow === 'Y' ? $t('common.yes') : $t('common.no') }}
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('common.operation')" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button size="mini" type="primary" @click="handleEdit(scope.row)">
+              {{ $t('common.edit') }}
+            </el-button>
+            <el-button size="mini" type="danger" @click="handleDelete(scope.row)">
+              {{ $t('common.delete') }}
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <el-pagination :current-page="pagination.current" :page-sizes="[10, 20, 30, 50]" :page-size="pagination.size"
+        :total="pagination.total" layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange"
+        @current-change="handleCurrentChange" />
+    </el-card>
+
+    <!-- 子组件 -->
+    <add-activities-type ref="addDialog" @success="handleSuccess" />
+    <edit-activities-type ref="editDialog" @success="handleSuccess" />
+    <delete-activities-type ref="deleteDialog" @success="handleSuccess" />
+  </div>
+</template>
+
+<script>
+import { getCommunityId } from '@/api/community/communityApi'
+import { queryActivitiesType } from '@/api/oa/activitiesTypeManageApi'
+import AddActivitiesType from '@/components/oa/addActivitiesType'
+import EditActivitiesType from '@/components/oa/editActivitiesType'
+import DeleteActivitiesType from '@/components/oa/deleteActivitiesType'
+
+export default {
+  name: 'ActivitiesTypeManageList',
+  components: {
+    AddActivitiesType,
+    EditActivitiesType,
+    DeleteActivitiesType
+  },
+  data() {
+    return {
+      loading: false,
+      searchForm: {
+        typeCd: '',
+        typeName: '',
+        defaultShow: '',
+        communityId: ''
+      },
+      tableData: [],
+      pagination: {
+        current: 1,
+        size: 10,
+        total: 0
+      }
+    }
+  },
+  created() {
+    this.searchForm.communityId = getCommunityId()
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      try {
+        this.loading = true
+        const params = {
+          page: this.pagination.current,
+          row: this.pagination.size,
+          ...this.searchForm
+        }
+        const { data, total } = await queryActivitiesType(params)
+        this.tableData = data
+        this.pagination.total = total
+      } catch (error) {
+        this.$message.error(this.$t('activitiesTypeManage.fetchError'))
+      } finally {
+        this.loading = false
+      }
+    },
+    handleSearch() {
+      this.pagination.current = 1
+      this.getList()
+    },
+    handleReset() {
+      this.searchForm = {
+        typeCd: '',
+        typeName: '',
+        defaultShow: '',
+        communityId: getCommunityId()
+      }
+      this.pagination.current = 1
+      this.getList()
+    },
+    handleAdd() {
+      this.$refs.addDialog.open()
+    },
+    handleEdit(row) {
+      this.$refs.editDialog.open(row)
+    },
+    handleDelete(row) {
+      this.$refs.deleteDialog.open(row)
+    },
+    handleSuccess() {
+      this.getList()
+    },
+    handleSizeChange(val) {
+      this.pagination.size = val
+      this.getList()
+    },
+    handleCurrentChange(val) {
+      this.pagination.current = val
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.activities-type-manage-container {
+  padding: 20px;
+
+  .search-wrapper {
+    margin-bottom: 20px;
+
+    .el-row {
+      margin-bottom: -20px;
+    }
+
+    .el-col {
+      margin-bottom: 20px;
+    }
+  }
+
+  .list-wrapper {
+    .el-pagination {
+      margin-top: 20px;
+      text-align: right;
+    }
+  }
+}
+</style>
\ No newline at end of file
--
libgit2 0.21.4