From 6f9341f56368b62df8fe5b8498d2c04c45d7b209 Mon Sep 17 00:00:00 2001
From: chenxf <chxf@chinaweal.com.cn>
Date: Sat, 28 Feb 2026 10:27:53 +0800
Subject: [PATCH] =?UTF-8?q?feat(forceNotice):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=B3=A8=E9=94=80=E5=85=AC=E5=91=8A=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在完成页面表格中新增所在单位列，并将接收人改为当前办理人
- 新增保存并发起拟强制注销公告按钮功能
- 添加确认提示对话框，防止误操作
- 集成强制注销相关API接口调用
- 优化任务列表页面的确认提示文案和样式
---
 src/views/finish/index.vue                |  5 +-
 src/views/forceNotice/taskList/detail.vue | 57 ++++++++++++++++++++++-
 src/views/forceNotice/taskList/list.vue   |  7 +--
 3 files changed, 62 insertions(+), 7 deletions(-)

diff --git a/src/views/finish/index.vue b/src/views/finish/index.vue
index b6991a7..1e04e4d 100644
--- a/src/views/finish/index.vue
+++ b/src/views/finish/index.vue
@@ -136,11 +136,10 @@
           <el-table-column prop="acceptno" label="受理编号" min-width="90" align="left" />
           <el-table-column prop="busname" :show-overflow-tooltip="true" label="业务名称" min-width="120" align="left" />
           <el-table-column prop="busTypeName" label="业务类型" min-width="100" align="left" />
+          <el-table-column prop="orgunitname" label="所在单位" min-width="100" align="left" />
           <el-table-column prop="busStatusName" label="业务状态" min-width="60" align="left" />
-          <el-table-column prop="signloginname" label="接收人" min-width="50" align="left" />
+          <el-table-column prop="currusername" label="当前办理人" min-width="80" align="left" />
           <el-table-column prop="createTime" label="受理时间" min-width="60" align="left" :formatter="dateFormat" />
-          <el-table-column prop="sendertime" label="发送时间" min-width="80" align="left" :formatter="dateFormat1" />
-          <el-table-column prop="sendername" label="发送人" min-width="50" align="left" />
           <el-table-column label="操作" min-width="120" align="left">
             <template slot-scope="scope">
               <el-button type="primary" size="mini" @click="showInfo(scope.row)">查看</el-button>
diff --git a/src/views/forceNotice/taskList/detail.vue b/src/views/forceNotice/taskList/detail.vue
index e11a6cd..b2a1236 100644
--- a/src/views/forceNotice/taskList/detail.vue
+++ b/src/views/forceNotice/taskList/detail.vue
@@ -65,8 +65,10 @@ import {
   announcementTaskUpdate,
   announcementTaskDetailAdd,
   announcementTaskDetailDeleteId,
-  announcementTaskDetailPage
+  announcementTaskDetailPage,
+  announcementTaskDetailListTaskListId
 } from '@/api/auto-baseapi'
+import { xrForceDeregisterSpeSaveIvdAcceptNew } from '@/api/force'
 
 export default {
   components: {
@@ -220,6 +222,59 @@ export default {
             this.$router.back()
           }
         },
+        {
+          label: '保存并发起拟强制注销公告',
+          type: 'primary',
+          show: () => !this.isAddMode,
+          handler: ({ formInstance }) => {
+            return formInstance.submitForm().then((formData) => {
+              return this.$confirm('发起拟强制注销公告后，当前名单无法修改，是否发起公告？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+                confirmHandlerPromise: () => {
+                  const savePromise = this.isAddMode
+                    ? announcementTaskAdd({ taskName: formData.taskName }).then((res) => {
+                      if (res.code === 0) {
+                        this.taskId = res.data.id || res.data
+                        this.isAddMode = false
+                        return this.taskId
+                      }
+                      return Promise.reject('保存失败')
+                    })
+                    : announcementTaskUpdate({ id: this.taskId, taskName: formData.taskName }).then((res) => {
+                      if (res.code === 0) return this.taskId
+                      return Promise.reject('保存失败')
+                    })
+
+                  return savePromise.then(taskId => {
+                    return announcementTaskDetailListTaskListId({ taskListId: taskId }).then(res => {
+                      if (res.code === 0 && res.data && res.data.length > 0) {
+                        const allEntList = res.data
+                        return xrForceDeregisterSpeSaveIvdAcceptNew({
+                          pripIdList: allEntList.map(item => item.pripid),
+                          busType: 'inclusion'
+                        }).then((data) => {
+                          this.$message.success('保存并发起拟强制注销公告成功')
+                          return this.$router.push({
+                            path: '/forceNotice/inclusion/todo/handle',
+                            query: { bizSeqNo: data.bizSeqId }
+                          })
+                        })
+                      } else {
+                        this.$message.warning('任务名单中没有企业，无法发起拟强制注销公告，仅保存成功')
+                        if (!this.isAddMode) {
+                          this.loadTaskInfo()
+                        }
+                        return Promise.reject()
+                      }
+                    })
+                  })
+                }
+              })
+            })
+          }
+        },
         {
           label: '保存',
           type: 'primary',
diff --git a/src/views/forceNotice/taskList/list.vue b/src/views/forceNotice/taskList/list.vue
index 7471e2b..50008d2 100644
--- a/src/views/forceNotice/taskList/list.vue
+++ b/src/views/forceNotice/taskList/list.vue
@@ -218,9 +218,10 @@ export default {
         this.$message.warning('请至少勾选一个任务名单')
         return
       }
-      this.$confirm(`已选择 ${this.selected.length} 个任务名单，是否发起拟强制注销公告？`, '提示', {
-        type: 'info',
-        customClass: 'type-1',
+      this.$confirm(`已选择 ${this.selected.length} 个任务名单，发起拟强制注销公告后，当前名单无法修改，是否发起公告？`, '提示', {
+        type: 'warning',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
         confirmHandlerPromise: () => {
           const promises = this.selected.map(task =>
             announcementTaskDetailListTaskListId({ taskListId: task.id })