feats

src/pages/property/bill/info/index.jsx

@@ -316,9 +316,9 @@ export default props => {
           <Table.Column title="缴费途径" dataIndex="payType" key="payType" render={t => getDictLabel(PayTypeDict, t)} />
           <Table.Column title="缴费人" dataIndex="payName" key="payName" />
           <Table.Column title="缴费时间" dataIndex="payDate" key="payDate" />
-          <Table.Column title="新建时间" dataIndex="createDate" key="createDate" render={t => moment(t).format('YYYY-MM-DD HH:mm')} />
+          <Table.Column title="新建时间" dataIndex="createDate" key="createDate" render={t => t ? moment(t).format('YYYY-MM-DD HH:mm') : ''} />
           <Table.Column title="新建人" dataIndex="createUserName" key="createUserName" />
-          <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" render={t => moment(t).format('YYYY-MM-DD HH:mm')}/>
+          <Table.Column title="修改时间" dataIndex="updateDate" key="updateDate" render={t => t ? moment(t).format('YYYY-MM-DD HH:mm'): ''}/>
           <Table.Column title="修改人" dataIndex="updateUserName" key="updateUserName" />
           <Table.Column
             title="操作"

src/pages/property/notice/index.jsx

@@ -67,13 +67,22 @@ export default props => {
   }
 
   const handleEditRow = row => {
-    updateannouncement({data: {
-      ...row,
-      status: Math.abs(row.status - 1)
-    }}).then(res => {
-      notification.success({message: '操作成功'})
-      setQueryParams({...queryParams})
-    })
+    // 发布改为不发布, 调用删除接口
+    if (1 === row.status - 0) {
+      deleteAnnouncement({data: {id: [row.id]}}).then(res => {
+        notification.success({message: '取消发布成功'})
+        setQueryParams({...queryParams})
+      })
+    } else {
+      // 未发布修改为已发布
+      updateannouncement({data: {
+        ...row,
+        status: '1'
+      }}).then(res => {
+        notification.success({message: '发布成功'})
+        setQueryParams({...queryParams})
+      })
+    }
   }
 
   const handlePageChange = (pageNum, pageSize) => {