From a0d5a3b0fe7381f4cdb8d9603355ab8e32c66418 Mon Sep 17 00:00:00 2001
From: liweijie <liweijie@fengyingkj.top>
Date: Fri, 18 Sep 2026 10:50:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=85=AC=E5=91=8A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=91=E5=B8=83=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/teachNotice.js          |  18 ++++
 frontend/src/views/teachNotice/index.vue | 103 ++++++++++++++++++++++-
 2 files changed, 117 insertions(+), 4 deletions(-)

diff --git a/frontend/src/api/teachNotice.js b/frontend/src/api/teachNotice.js
index ff5c4800..35cd0580 100644
--- a/frontend/src/api/teachNotice.js
+++ b/frontend/src/api/teachNotice.js
@@ -44,4 +44,22 @@ export function delTeachNotice(Id) {
     method: 'post',
     params: { Id }
   })
+}
+
+// 发布或重新发布公告：{id, scopeType: ALL|ALL_TEACHERS|DEPARTMENTS, departmentIds?}
+export function publishTeachNotice(data) {
+  return request({
+    url: '/notice-announcement/publish',
+    method: 'post',
+    data: data
+  })
+}
+
+// 下架已发布公告
+export function downTeachNotice(id) {
+  return request({
+    url: '/notice-announcement/down',
+    method: 'post',
+    data: { id }
+  })
 }
\ No newline at end of file
diff --git a/frontend/src/views/teachNotice/index.vue b/frontend/src/views/teachNotice/index.vue
index 5f6bc26e..42bce646 100644
--- a/frontend/src/views/teachNotice/index.vue
+++ b/frontend/src/views/teachNotice/index.vue
@@ -90,13 +90,22 @@
             @click="handleView(scope.row)"
           >详情</el-button>
           <el-button
+            v-if="scope.row.status !== '已发布'"
             type="text"
             size="mini"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
           >修改</el-button>
           <el-button
-            v-if="scope.row.status !== '已下架'"
+            v-if="scope.row.status !== '已发布'"
+            type="text"
+            size="mini"
+            icon="el-icon-position"
+            style="color: #67c23a"
+            @click="handlePublish(scope.row)"
+          >发布</el-button>
+          <el-button
+            v-if="scope.row.status === '已发布'"
             type="text"
             size="mini"
             icon="el-icon-download"
@@ -202,11 +211,56 @@
         <el-button size="mini" @click="handleViewVisible(false)">关 闭</el-button>
       </div>
     </el-dialog>
+
+    <!-- 发布 对话框 -->
+    <el-dialog
+      title="发布公告"
+      :visible="publishVisible"
+      :close-on-click-modal="false"
+      width="520px"
+      @update:visible="val => publishVisible = val"
+    >
+      <el-form label-width="90px">
+        <el-form-item label="公告标题">
+          <span>{{ publishRow.title }}</span>
+        </el-form-item>
+        <el-form-item label="发布范围" required>
+          <el-radio-group v-model="publishForm.scopeType">
+            <el-radio label="ALL">全校</el-radio>
+            <el-radio label="ALL_TEACHERS">全体教员</el-radio>
+            <el-radio label="DEPARTMENTS">指定部别</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item v-if="publishForm.scopeType === 'DEPARTMENTS'" label="部别" required>
+          <el-select
+            v-model="publishForm.departmentIds"
+            multiple
+            filterable
+            collapse-tags
+            placeholder="请选择部别"
+            style="width: 100%"
+            :loading="deptLoading"
+          >
+            <el-option
+              v-for="d in deptOptions"
+              :key="d.deptId"
+              :label="d.deptName"
+              :value="String(d.deptId)"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" size="mini" :loading="publishing" @click="submitPublish">发 布</el-button>
+        <el-button size="mini" @click="publishVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listTeachNotice, getTeachNotice, addTeachNotice, updateTeachNotice, delTeachNotice } from "@/api/teachNotice"
+import { listTeachNotice, getTeachNotice, addTeachNotice, updateTeachNotice, delTeachNotice, publishTeachNotice, downTeachNotice } from "@/api/teachNotice"
+import { listDept } from "@/api/system/dept"
 
 export default {
   name: "TeachNotice",
@@ -236,7 +290,14 @@ export default {
       },
       // 详情 对话框
       viewVisible: false,
-      viewForm: {}
+      viewForm: {},
+      // 发布 对话框
+      publishVisible: false,
+      publishing: false,
+      publishRow: {},
+      publishForm: { scopeType: 'ALL', departmentIds: [] },
+      deptOptions: [],
+      deptLoading: false
     }
   },
   created() {
@@ -331,6 +392,40 @@ export default {
         }
       })
     },
+    /** 发布（拟制/已下架 → 已发布） */
+    handlePublish(row) {
+      this.publishRow = row
+      this.publishForm = { scopeType: 'ALL', departmentIds: [] }
+      this.publishVisible = true
+      if (!this.deptOptions.length && !this.deptLoading) {
+        this.deptLoading = true
+        listDept({ status: '0' }).then(res => {
+          this.deptOptions = res.data || []
+        }).catch(() => {}).finally(() => {
+          this.deptLoading = false
+        })
+      }
+    },
+    /** 提交发布 */
+    submitPublish() {
+      const f = this.publishForm
+      if (f.scopeType === 'DEPARTMENTS' && !f.departmentIds.length) {
+        this.$message.warning("请选择至少一个部别")
+        return
+      }
+      this.publishing = true
+      publishTeachNotice({
+        id: this.publishRow.id,
+        scopeType: f.scopeType,
+        departmentIds: f.scopeType === 'DEPARTMENTS' ? f.departmentIds : undefined
+      }).then(() => {
+        this.$message.success("发布成功")
+        this.publishVisible = false
+        this.getList()
+      }).catch(() => {}).finally(() => {
+        this.publishing = false
+      })
+    },
     /** 下架 */
     handleOffline(row) {
       this.$confirm("确认下架该公告吗？", "提示", {
@@ -338,7 +433,7 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        updateTeachNotice({ id: row.id, status: '已下架' }).then(() => {
+        downTeachNotice(row.id).then(() => {
           this.$message.success("下架成功")
           this.getList()
         }).catch(() => {})