From 7ea667e74df85e36519ebc3cbdfbf5a7954c6ff2 Mon Sep 17 00:00:00 2001
From: qiuyuan <qiuyuan@yonyou.com>
Date: Sat, 28 Jun 2025 15:13:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../announcementList/components/AddDialog.vue | 53 ++++++++++---------
 .../announcement/announcementList/index.vue   | 23 ++++++--
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/views/announcement/announcementList/components/AddDialog.vue b/src/views/announcement/announcementList/components/AddDialog.vue
index 56b1fd4..d7f8b4b 100644
--- a/src/views/announcement/announcementList/components/AddDialog.vue
+++ b/src/views/announcement/announcementList/components/AddDialog.vue
@@ -1,39 +1,38 @@
 <template>
-    <a-modal
-        :open="modal.open"
-        :title="modal.title"
-        :width="640"
-        :confirm-loading="modal.confirmLoading"
-        :after-close="onAfterClose"
-        :cancel-text="cancelText"
-        :ok-text="okText"
-        @ok="handleOk"
-        @cancel="handleCancel">
-        <a-form
-            ref="formRef"
-            :model="formData"
-            :rules="formRules"
-            :label-col="{ style: { width: '90px' } }">
+    <a-modal :open="modal.open" :title="modal.title" :width="640" :confirm-loading="modal.confirmLoading"
+        :after-close="onAfterClose" :cancel-text="cancelText" :ok-text="okText" @ok="handleOk" @cancel="handleCancel">
+        <a-form ref="formRef" :model="formData" :rules="formRules" :label-col="{ style: { width: '90px' } }">
             <a-card class="mb-8-2">
                 <a-row :gutter="24">
                     <a-col :span="24">
-                        <a-form-item
-                            :label="$t('pages.system.announcement.form.title')"
-                            name="title">
-                            <a-input
-                                :placeholder="$t('pages.system.announcement.form.title.placeholder')"
+                        <a-form-item :label="$t('pages.system.announcement.form.title')" name="title">
+                            <a-input :placeholder="$t('pages.system.announcement.form.title.placeholder')"
                                 v-model:value="formData.title"></a-input>
                         </a-form-item>
                     </a-col>
                     <a-col :span="24">
-                        <a-form-item
-                            :label="$t('pages.system.announcement.form.content')"
-                            name="content">
-                            <a-textarea
-                                v-model:value="formData.content"
+                        <a-form-item :label="$t('pages.system.announcement.form.content')" name="content">
+                            <a-textarea v-model:value="formData.content"
                                 :placeholder="$t('pages.system.announcement.form.content.placeholder')" />
                         </a-form-item>
                     </a-col>
+                    <a-col :span="12">
+                        <a-form-item :label="'所属区域'" name="areaId">
+                            <a-select ref="select" v-model:value="formData.areaId" :placeholder="$t('pages.system.announcement.form.content.placeholder')">
+                                <a-select-option 
+                                    v-for="item in areaEnum.getAll()" 
+                                    :value="item.value">{{item.name }}</a-select-option>
+                            </a-select>
+                        </a-form-item>
+                    </a-col>
+                    <a-col :span="12">
+                            <a-form-item :label="'状态'" name="status">
+                                <a-radio-group v-model:value="formData.status" :options="[
+                                    { label: '启用', value: 'enabled' },
+                                    { label: '停用', value: 'disabled' },
+                                ]"></a-radio-group>
+                            </a-form-item>
+                        </a-col>
                     <!-- <a-col :span="24">
                         <a-form-item
                             :label="$t('pages.system.announcement.form.createdAt')"
@@ -50,6 +49,7 @@
 </template>
 
 <script setup>
+import { areaEnum } from "@/enums/useEnum"
 import { cloneDeep } from 'lodash-es'
 import { ref } from 'vue'
 import { config } from '@/config'
@@ -69,7 +69,8 @@ const roles = ref([])
 formRules.value = {
     title: { required: true, message: t('pages.system.announcement.form.title.placeholder') },
     content: { required: true, message: t('pages.system.announcement.form.content.placeholder') },
-    // createdAt: { required: true, message: t('pages.system.announcement.form.createdAt.placeholder') },
+    areaId: { required: true, message: '请选择区域'},
+    status: { required: true, message: '请选择是否启用'},
 }
 
 /**
diff --git a/src/views/announcement/announcementList/index.vue b/src/views/announcement/announcementList/index.vue
index db9e5e6..eb14ca4 100644
--- a/src/views/announcement/announcementList/index.vue
+++ b/src/views/announcement/announcementList/index.vue
@@ -71,6 +71,21 @@
                             </a-tag>
                         </template>
 
+                        <template v-if="'status' === column.dataIndex">
+                            <a-tag v-if="record.status === 'enabled'" :color="'green'">启用</a-tag>
+                            <a-tag v-if="record.status === 'disabled'" :color="'red'">停用</a-tag>
+                        </template>
+
+                       <template v-if="column.dataIndex === 'areaId'">
+                            <span>{{ areaEnum.getName(record.areaId) }}</span>
+                        </template>
+                     
+
+                        <template v-if="statusTypeEnum.is('disabled', record.status)">
+                            {{ dayjs(record.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
+                        </template>
+
+
                         <template v-if="'createdAt' === column.dataIndex">
                             {{ dayjs(record.createdAt).format('YYYY-MM-DD HH:mm:ss') }}
                         </template>
@@ -103,12 +118,14 @@ import { message, Modal } from 'ant-design-vue'
 import { ref } from 'vue'
 import apis from '@/apis'
 import { config } from '@/config'
-import { statusTypeEnum } from '@/enums/system'
+import { statusTypeEnum} from '@/enums/system'
+
 import { usePagination } from '@/hooks'
 import AddDialog from './components/AddDialog.vue'
 import { PlusOutlined, EditOutlined, DeleteOutlined } from '@ant-design/icons-vue'
 import { useI18n } from 'vue-i18n'
 import dayjs from 'dayjs'
+import { customersEnum, areaEnum } from "@/enums/useEnum"
 
 defineOptions({
     name: 'systemRole',
@@ -119,8 +136,8 @@ const columns = [
     { title: t('pages.system.announcement.form.createdAt'), dataIndex: 'createdAt', width: 200 },
     { title: t('pages.system.announcement.form.title'), dataIndex: 'title', key: 'title', width: 240 },
     { title: t('pages.system.announcement.form.content'), dataIndex: 'content', width: 240 },
-    { title: t('pages.system.announcement.form.status'), key: 'status', width: 120 },
-    { title: t('pages.system.announcement.form.areaId'), key: 'areaId', width: 120 },
+    { title: t('pages.system.announcement.form.status'), key: 'status', dataIndex: 'status', width: 120 },
+    { title: t('pages.system.announcement.form.areaId'), key: 'areaId', dataIndex: 'areaId', width: 120 },
     { title: t('button.action'), key: 'action', fixed: 'right', width: 120 },
 ]