From 1bad39e83a470030c81a0a9f0a2a7fb0c3dd1c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Thu, 25 Nov 2021 15:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=AE=A2=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E4=B8=8E=E6=81=A2=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/task/api.js                      | 23 +++--
 .../task/components/adminRouter/index.jsx     |  2 +-
 src/military/task/taskAdmin/index.jsx         | 99 +++++++++++++------
 src/military/task/taskAdmin/index.scss        |  6 ++
 src/military/task/taskDetail/index.jsx        |  6 +-
 5 files changed, 93 insertions(+), 43 deletions(-)

diff --git a/src/military/task/api.js b/src/military/task/api.js
index 3d8052b2d..85645e2b8 100644
--- a/src/military/task/api.js
+++ b/src/military/task/api.js
@@ -120,10 +120,17 @@ export async function getTaskDetail(id) {
   if (res.data) {
     return res.data;
   } else {
-    notification.open({
-      message: "提示",
-      description: res.message || '请求错误',
-    });
+    if(res.message&&res.message.indexOf('exist')>-1){
+      notification.open({
+        message: "提示",
+        description: "未查到该任务",
+      });
+    }else{
+      notification.open({
+        message: "提示",
+        description: res.message || '请求错误',
+      });
+    } 
   }
 }
 
@@ -146,9 +153,9 @@ export function updateTask(data) {
 }
 
 //删除
-export function deleteTask(id) {
+export function deleteTask(id, isDelete) {
   return fetch({
-    url: '/api/tasks/' + id,
+    url: '/api/tasks/' + id + '?isDelete=' + isDelete,
     method: 'DELETE',
   });
 }
@@ -499,7 +506,7 @@ export async function uploadPayProofList(params) {
 }
 
 // 管理员上传支付凭证
-export function uploadPayProof(data){
+export function uploadPayProof(data) {
   return fetch({
     url: `/api/sign/admin/paper/payment/${data.paperId}`,
     method: 'post',
@@ -557,7 +564,7 @@ export function delayTask(data) {
   return fetch({
     url: `/api/tasks/backend/admin/task/delay/${data.taskId}`,
     method: 'post',
-    data:data.params,
+    data: data.params,
   });
 }
 
diff --git a/src/military/task/components/adminRouter/index.jsx b/src/military/task/components/adminRouter/index.jsx
index e9003c5e5..4132b4c58 100644
--- a/src/military/task/components/adminRouter/index.jsx
+++ b/src/military/task/components/adminRouter/index.jsx
@@ -30,7 +30,7 @@ export default props => {
         <Menu.Item><a href="/task/payProof">支付报酬凭证上传</a></Menu.Item>
       </SubMenu>
 
-      <Menu.Item><a href="/task/taskAdmin">创客列表</a></Menu.Item>
+      <Menu.Item><a href="/task/taskAdmin">任务列表</a></Menu.Item>
       <Menu.Item><a href="/task/paperManage">创意征集评论</a></Menu.Item>
     </Menu>
   });
diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx
index c97e1defe..2ca99d8a7 100644
--- a/src/military/task/taskAdmin/index.jsx
+++ b/src/military/task/taskAdmin/index.jsx
@@ -1,10 +1,10 @@
 import React, { useCallback, useEffect, useState, useMemo } from 'react';
 import classNames from 'classnames';
-import { Input, Select, Button, Form, DatePicker, Table, Pagination, } from 'antd';
+import { Input, Select, Button, Form, DatePicker, Table, Pagination, Modal } from 'antd';
 import { Link } from "react-router-dom";
 
-import { paperCheckStatusArr, publishModeArr, taskStatusAllArr, showUserModeArr ,main_web_site_url} from '../static';
-import { getTaskAdminList, changeShowUserMode,deleteTask } from '../api';
+import { paperCheckStatusArr, publishModeArr, taskStatusAllArr, showUserModeArr, main_web_site_url } from '../static';
+import { getTaskAdminList, changeShowUserMode, deleteTask } from '../api';
 import '../index.scss';
 import './index.scss';
 const format = "YYYY-MM-DD HH:mm:ss";
@@ -23,11 +23,12 @@ for (const item of paperCheckStatusArr) {
 export default Form.create()(({ form, showNotification, match, history }) => {
   const { getFieldDecorator, setFieldsValue, getFieldsValue } = form;
 
-  const [reload,setReload]=useState();
+  const [reload, setReload] = useState();
   const [loading, setLoading] = useState(false);
   const [statusString, setStatusString] = useState('');
   const [publishMode, setPublishMode] = useState('');
   const [showUserMode, setShowUserMode] = useState('');
+  const [isDelete, setIsDelete] = useState('0');
 
   const [sort, setSort] = useState('Desc');
   const [order, setOrder] = useState('createdAt');
@@ -46,6 +47,7 @@ export default Form.create()(({ form, showNotification, match, history }) => {
       curPage,
       pageSize: 10,
       orderBy: order + sort,
+      isDelete,
     };
     setLoading(true);
     getTaskAdminList(params).then(data => {
@@ -55,7 +57,7 @@ export default Form.create()(({ form, showNotification, match, history }) => {
       }
       setLoading(false);
     })
-  }, [statusString, order, sort, publishMode, showUserMode, curPage, searchObj,reload]);
+  }, [statusString, order, sort, publishMode, showUserMode, curPage, searchObj, isDelete, reload]);
 
 
   const helper = useCallback(
@@ -102,7 +104,7 @@ export default Form.create()(({ form, showNotification, match, history }) => {
         dataIndex: 'name',
         width: "15%",
         render: (text, record) => (
-          <Link className="line_1 primary-link" to={`/task/taskDetail/${record.id}`}>{text}</Link>
+          <Link className="line_1 primary-link" target="_blank" to={`/task/taskDetail/${record.id}`} >{text}</Link>
         ),
       },
       {
@@ -201,21 +203,34 @@ export default Form.create()(({ form, showNotification, match, history }) => {
         key: 'action',
         render: (text, record) => (
           <React.Fragment>
-            <Button className="mr5 font-12" type="danger" size="small" onClick={() => { deletItem(record.id) }}>删除</Button>
+
+            {
+              isDelete == '0' ? <Button className="mr5 font-12" type="danger" size="small" onClick={() => { deletItem(record.id, '1') }}>隐藏</Button>
+                : <Button className="mr5 font-12" type="primary" size="small" onClick={() => { deletItem(record.id, '0') }}>恢复</Button>
+            }
+
             {/* <Link className="line_1 color-grey3" to={`/task/taskDetail/${record.taskId}`}>查看</Link> */}
           </React.Fragment>
         ),
       },
     ]
-  }, []);
+  }, [isDelete]);
 
 
-  function deletItem(id){
-    deleteTask(id).then(res=>{
-      if(res.message==='success'){
-        showNotification('删除成功!');
-        setReload(Math.random());
-      }
+  function deletItem(id, isDelete) {
+    Modal.confirm({
+      title: "警告",
+      content: isDelete == '0' ? "确认恢复该任务吗？恢复后用户可以重新看到该任务！" : "确认隐藏？隐藏后用户无法看到该任务！",
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        deleteTask(id, isDelete).then(res => {
+          if (res.message === 'success') {
+            showNotification('操作成功!');
+            setReload(Math.random());
+          }
+        });
+      },
     });
   }
 
@@ -243,13 +258,18 @@ export default Form.create()(({ form, showNotification, match, history }) => {
     setCurPage(1);
   }, []);
 
+  const changeShow = useCallback((isDelete) => {
+    setIsDelete(isDelete);
+    setCurPage(1);
+  })
+
   function downloadFile() {
     window.open(main_web_site_url + '/admin/tasks.xlsx');
   }
 
   return (
     <div className="centerbox task-manage-all ">
-      
+
       <div className="search-screen" >
         {helper(
           "任务名称",
@@ -301,25 +321,40 @@ export default Form.create()(({ form, showNotification, match, history }) => {
         </div>
       </div>
 
-      <Form.Item className="inline-form" label="排序">
-        <Select
-          style={{ width: '200px' }}
-          showArrow
-          onChange={changeSortName}
-          defaultValue='createdAt'
-        >
-          <Option key={'createdAt'} >创建时间</Option>
-          <Option key={'publishedAt'} >发布时间</Option>
-        </Select>
+      <div className="select-box">
+        <Form.Item className="inline-form" label="显示状态">
+          <Select
+            style={{ width: '200px' }}
+            showArrow
+            onChange={changeShow}
+            defaultValue='0'
+          >
+            <Option key={'0'} >正常显示（默认）</Option>
+            <Option key={'1'} >已隐藏</Option>
+          </Select>
+        </Form.Item>
 
-        <span className={classNames({ "sort-active": sort === 'Desc', 'sort-icon': true, 'ml10': true })} onClick={() => { changeSort('Desc') }}>
-          <i className="fa fa-long-arrow-down font-16  "></i>
-        </span>
-        <span className={classNames({ "sort-active": sort === 'Asc', 'sort-icon': true })} onClick={() => { changeSort('Asc') }}>
-          <i className="fa fa-long-arrow-up font-16 "></i>
-        </span>
+        <Form.Item className="inline-form" label="排序">
+          <Select
+            style={{ width: '200px' }}
+            showArrow
+            onChange={changeSortName}
+            defaultValue='createdAt'
+          >
+            <Option key={'createdAt'} >创建时间</Option>
+            <Option key={'publishedAt'} >发布时间</Option>
+          </Select>
+
+          <span className={classNames({ "sort-active": sort === 'Desc', 'sort-icon': true, 'ml10': true })} onClick={() => { changeSort('Desc') }}>
+            <i className="fa fa-long-arrow-down font-16  "></i>
+          </span>
+          <span className={classNames({ "sort-active": sort === 'Asc', 'sort-icon': true })} onClick={() => { changeSort('Asc') }}>
+            <i className="fa fa-long-arrow-up font-16 "></i>
+          </span>
+
+        </Form.Item>
+      </div>
 
-      </Form.Item>
 
 
 
diff --git a/src/military/task/taskAdmin/index.scss b/src/military/task/taskAdmin/index.scss
index 1b7a76a5f..087e99ccc 100644
--- a/src/military/task/taskAdmin/index.scss
+++ b/src/military/task/taskAdmin/index.scss
@@ -48,6 +48,12 @@
   a.primary-link {
     color: #1890ff;
   }
+
+  .select-box{
+    display: flex;
+    justify-content: space-between;
+  }
+
 }
 
 .inline-form {
diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx
index c67a4e961..786f78570 100644
--- a/src/military/task/taskDetail/index.jsx
+++ b/src/military/task/taskDetail/index.jsx
@@ -53,7 +53,6 @@ export default Form.create()(
 
     const [visibleProofs, setVisibleProofs] = useState(false);
 
-
     // 获取任务领域配置数据
     useEffect(() => {
       getTaskCategory().then(data => {
@@ -70,8 +69,11 @@ export default Form.create()(
     // 获取本任务详情
     useEffect(() => {
       id && getTaskDetail(id).then(data => {
+        if(!data){
+          history.push('/task');
+        }
         setDetailData(data || {});
-      })
+      });
     }, [id, reload]);
 
     // 检查用户是否同意协议