Merge branch 'JKDevelop' of http://106.75.45.236:3000/durian/forgeplus-react into JKDevelop

src/forge/Settings/Index.js

@@ -113,7 +113,7 @@ class Index extends Component {
               </p>
             </li>
             {
-              false && projectDetail && projectDetail.permission && (projectDetail.permission === "Owner" || projectDetail.permission === "Admin") ?
+              projectDetail && projectDetail.permission && (projectDetail.permission === "Owner" || projectDetail.permission === "Admin") ?
               <li
                 className={pathname.indexOf("settings/special") > -1 ? "active" : ""}
               >

src/military/task/index.scss

@@ -88,7 +88,7 @@ span.list-gray {
 }
 
 .center-content .ant-pagination {
-  margin: 2rem auto;
+  margin: 2rem auto !important;
   text-align: center;
   .ant-pagination-item:focus, .ant-pagination-item:hover, .ant-pagination-item-active, .ant-pagination-prev:hover a, .ant-pagination-next:hover a, .ant-pagination-options-quick-jumper input:focus, .ant-pagination-options-quick-jumper input:hover{
     border-color: #4154f1;

src/military/task/paperComplain/index.js

@@ -95,16 +95,16 @@ export default Form.create()(({  form, showNotification, history}) => {
   const columns = useMemo(() => {
     return [
       {
-        title: '序号',
+        title: '成果编号',
-        dataIndex: 'index',
+        dataIndex: 'paperNumber',
-        render: (text, record, index) => {
+        render: (text, record) => {
-          return index + 1
+          return text ? <Link className="line_1 color-grey3" to={`/task/taskDetail/${record.taskId}`}>{text}</Link> : '--'
         }
       },
       {
         title: '申诉内容',
         dataIndex: 'content',
-        width: "30%",
+        width: "26%",
       },
       {
         title: '申诉文件',

src/military/task/paperManage/index.jsx

@@ -90,7 +90,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his
             setReload(Math.random());
             setVisible(false);
             setFieldsValue({
-              pass: '',
+              pass: 2,
               message: '',
             })
           }