fats

src/pages/property/news/type/NewsType.jsx

@@ -58,7 +58,7 @@ function NewsType(props) {
 
 
   const changeNewsStatus = (row, newsId) => () => {
-    request({ ...propNews.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
+    request({ ...apis.propNews.newsType.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
       message.info('操作成功！')
       getList({ pageNum: 1, pageSize: 10 });
     }).catch((err) => {

src/pages/property/notice/Edit.jsx

@@ -89,7 +89,8 @@ export default Form.create()(props => {
         <Form.Item label="类型">
         {
           getFieldDecorator('annType')(
-            <Select style={{}} allowClear>
+            <Select allowClear>
+              <Select.Option value={undefined}></Select.Option>
               <Select.Option value="notice">提醒</Select.Option>
             </Select>
           )

src/pages/property/notice/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm } from 'antd'
+import { Select, Spin, Table, Button, Form, Input, Divider, Modal,Popconfirm, notification } from 'antd'
 import NavLink from 'umi/navlink'
 import { fetch, apis } from '@/utils/request'
 import Search from '../components/Search'
@@ -7,6 +7,7 @@ import List from '../components/List'
 
 const listAnnouncement = fetch(apis.announcement.listAnnouncement)
 const deleteAnnouncement = fetch(apis.announcement.deleteAnnouncement)
+const updateannouncement = fetch(apis.announcement.updateannouncement)
 
 const Condition = props => {
   return (
@@ -46,7 +47,7 @@ const Condition = props => {
 }
 
 const StatusDict = {
-  '0': '已作废',
+  '0': '未发布',
   '1': '已发布',
   '2': '草稿'
 }
@@ -65,15 +66,13 @@ export default props => {
     })
   }
 
-  const handleDeleteRow = row => {
-    deleteAnnouncement({ data: [row.id] }).then(res => {
-      Modal.success({
-        content: '删除内容成功',
-        onOk: () => {
-          // 触发数据刷新
-          setQueryParams({...queryParams})
-        }
-      })
+  const handleEditRow = row => {
+    updateannouncement({data: {
+      ...row,
+      status: Math.abs(row.status - 1)
+    }}).then(res => {
+      notification.success({message: '操作成功'})
+      setQueryParams({...queryParams})
     })
   }
 
@@ -88,7 +87,6 @@ export default props => {
   useEffect(() => {
     setLoading(true)
     listAnnouncement({ data: queryParams }).then(res => {
-      console.log(res,"222")
       const { list, ...pageInfo } = res || {}
       setListData(list)
       setPagination(pageInfo)
@@ -124,13 +122,7 @@ export default props => {
           title="状态"
           dataIndex="status"
           key="status"
-          render={(_, row) => {
-            if (row.status === '1' && (row.updateDate > row.createDate)) {
-              return '已修改'
-            }
-
-            return StatusDict[row.status]
-          }}
+          render={(_, row) => StatusDict[row.status]}
         />
         <Table.Column title="创建时间" dataIndex="createDate" key="createDate" />
         {/* <Table.Column title="发布人" dataIndex="createUserName" key="createUserName" />
@@ -143,12 +135,12 @@ export default props => {
             return (
               <>
                 <Popconfirm
-                  title="确认进行作废操作?"
-                  onConfirm={() => handleDeleteRow(row)}
-                  okText="作废"
+                  title="确认进行当前操作?"
+                  onConfirm={() => handleEditRow(row)}
+                  okText="确定"
                   cancelText="取消"
                 >
-                  <Button type="link">删除</Button>
+                  <Button type="link">{row.status === '1' ? '取消发布' : '发布'}</Button>
                 </Popconfirm>
                 <Divider type="vertical" />
                 <NavLink to={`/property/notice/edit?id=${row.id}`}>