From c67611f20423c91bf06001b9400e898df9f52e1e Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Wed, 1 Mar 2023 14:21:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppAnnounceResident/components/List.vue         | 13 +++++++------
 .../AppAnnounceWeChat/components/List.vue           | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue
index 341dcc58..5ff26a3a 100644
--- a/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue
+++ b/packages/wxwork/AnnounceResident/AppAnnounceResident/components/List.vue
@@ -74,6 +74,7 @@
         <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
+              <el-button type="text" @click="close(row.id)" v-if="['3'].includes(row.status)">关闭</el-button>
               <el-button type="text" @click="remindExamine(row.id)" v-if="['0'].includes(row.status)">催办</el-button>
               <el-button type="text" @click="cancel(row.id)" v-if="['0'].includes(row.status)">撤回</el-button>
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
@@ -182,7 +183,7 @@
 
       remindExamine (id) {
         this.$confirm('确认再次通知任务审核人员？').then(() => {
-          this.instance.post(`/app/appmasssendingtask/remindExamine?id=${id}`).then(res => {
+          this.instance.post(`/app/whchatmomentstask/remindExamine?id=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('催办成功！')
               this.getList()
@@ -193,7 +194,7 @@
 
       cancel (id) {
         this.$confirm('确认撤回该群发任务？').then(() => {
-          this.instance.post(`/app/appmasssendingtask/cancel?id=${id}`).then(res => {
+          this.instance.post(`/app/whchatmomentstask/cancel?id=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('撤回成功！')
               this.getList()
@@ -202,11 +203,11 @@
         })
       },
 
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appmasssendingtask/delete?ids=${id}`).then(res => {
+      close (id) {
+        this.$confirm('确定关闭该群发任务？').then(() => {
+          this.instance.post(`/app/whchatmomentstask/closeTask?id=${id}`).then(res => {
             if (res.code == 0) {
-              this.$message.success('删除成功！')
+              this.$message.success('关闭成功！')
               this.getList()
             }
           })
diff --git a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue
index 5c5cf565..f4502819 100644
--- a/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue
+++ b/packages/wxwork/AnnounceWeChat/AppAnnounceWeChat/components/List.vue
@@ -74,6 +74,7 @@
         <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
+              <el-button type="text" @click="close(row.id)" v-if="['3'].includes(row.status)">关闭</el-button>
               <el-button type="text" @click="remindExamine(row.id)" v-if="['0'].includes(row.status)">催办</el-button>
               <el-button type="text" @click="cancel(row.id)" v-if="['0'].includes(row.status)">撤回</el-button>
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
@@ -182,7 +183,7 @@
 
       remindExamine (id) {
         this.$confirm('确认再次通知任务审核人员？').then(() => {
-          this.instance.post(`/app/appmasssendingtask/remindExamine?id=${id}`).then(res => {
+          this.instance.post(`/app/whchatmomentstask/remindExamine?id=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('催办成功！')
               this.getList()
@@ -193,7 +194,7 @@
 
       cancel (id) {
         this.$confirm('确认撤回该群发任务？').then(() => {
-          this.instance.post(`/app/appmasssendingtask/cancel?id=${id}`).then(res => {
+          this.instance.post(`/app/whchatmomentstask/cancel?id=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('撤回成功！')
               this.getList()
@@ -202,11 +203,11 @@
         })
       },
 
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appmasssendingtask/delete?ids=${id}`).then(res => {
+      close (id) {
+        this.$confirm('确定关闭该群发任务？').then(() => {
+          this.instance.post(`/app/whchatmomentstask/closeTask?id=${id}`).then(res => {
             if (res.code == 0) {
-              this.$message.success('删除成功！')
+              this.$message.success('关闭成功！')
               this.getList()
             }
           })