浏览代码

删除 完成 首页公告 已发布渲染

liangyan0105 3 年之前
父节点
当前提交
c4bf097ee7
共有 2 个文件被更改,包括 34 次插入23 次删除
  1. 3 3
      src/views/dashboard/MyToDo.vue
  2. 31 20
      src/views/oa/enterpriseAnnouncement.vue

+ 3 - 3
src/views/dashboard/MyToDo.vue

@@ -86,7 +86,7 @@
               <ul class="clearfix">
                 <li v-for="item in annList" :key="item.id">
                   <!-- 显示已发布的公告  需轮播 -->
-                  <div v-if="item.isRelease == '1'">
+                  <div>
                     <a href="javascript:void(0);" class="clearfix">
                       <span class="department fl" v-if="item.type == '项目'" style="color:#006d77;">
                         [ {{ item.type }} ]
@@ -230,7 +230,7 @@
     </a-row>
 
     <!-- 按钮弹框 -->
-    <a-modal v-model="lcModal.visible" :title="lcModal.Title" :footer="null" :maskClosable="false" width="90%">
+    <a-modal v-model="lcModal.visible" :title="lcModal.title" :footer="null" :maskClosable="false" width="90%">
       <component
         :disabled="lcModal.disabled"
         v-if="lcModal.visible"
@@ -496,7 +496,7 @@ export default {
 
     // 公告数据
     getAnnList() {
-      enterpriseEList().then(res => {
+      enterpriseEList({isRelease:'1',pageSize:1000}).then(res => {
         if (res.success) {
           this.annList = res.result.records || []
           console.log('首页公告----->', this.annList)

+ 31 - 20
src/views/oa/enterpriseAnnouncement.vue

@@ -103,8 +103,8 @@
 
             <a-divider type="vertical" />
 
-            <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否">
-              <a href="javascript:void(0);" @click="delAnn(record.id)" class="delRed"> 删除 </a>
+            <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="delAnn(record)">
+              <a href="javascript:void(0);" class="delRed"> 删除 </a>
             </a-popconfirm>
           </span>
         </a-table>
@@ -117,7 +117,12 @@
 
 <script>
 import AddAnnModal from '@views/oa/enter-ann/add/addAnnModal.vue'
-import { enterpriseEList, enterpriseEQueryById, enterpriseEReleseUpdate } from '@api/oa/cd-enterprise-announcement'
+import {
+    enterpriseEList,
+    enterpriseEQueryById,
+    enterpriseEReleseUpdate,
+    enterpriseEDelete
+} from '@api/oa/cd-enterprise-announcement'
 export default {
     name: 'EnterpriseAnnouncement', // 企业公告
 
@@ -232,28 +237,25 @@ export default {
             })
         },
 
-        // 批量删除
-        batchDel () {},
-        // 清空
-        onClearSelected () {},
-        // ??
-        modalFormOk () {},
-        // 分页、排序、筛选变化时触发
-        handleTableChange (pagination, filters, sorter) {
-            // console.log('当前页信息>>>>',pagination)
-            this.queryParam.pageNo = pagination.current
-            this.getAnnList()
-        },
-
         // 发布
         sendAnn (id) {
-            // console.log('点击了发布')
             enterpriseEReleseUpdate({ id: id, isRelease: '1' }).then(res => {
                 console.log(res)
                 this.$message.success('发布成功')
                 this.getAnnList()
             })
         },
+        // 删除公告
+        delAnn (record) {
+            console.log('点击公告对象', record)
+            enterpriseEDelete({ id: record.id }).then(res => {
+                if (res.success) {
+                    console.log(res)
+                    this.$message.success('删除成功')
+                    this.getAnnList()
+                }
+            })
+        },
         // 取消发布
         saveAnn (id) {
             console.log('点击了取消发布')
@@ -263,9 +265,18 @@ export default {
                 this.getAnnList() // 渲染公告
             })
         },
-        // 操作  删除
-        delAnn () {
-            console.log('点击了删除,需要发请求、确定提示、重新渲染')
+
+        // 批量删除
+        batchDel () {},
+        // 清空
+        onClearSelected () {},
+        // ??
+        modalFormOk () {},
+        // 分页、排序、筛选变化时触发
+        handleTableChange (pagination, filters, sorter) {
+            // console.log('当前页信息>>>>',pagination)
+            this.queryParam.pageNo = pagination.current
+            this.getAnnList()
         }
     },
     computed: {