Merge pull request '竞赛增加排序' (#465) from tongChong/forgeplus-react:pre_dev_military into pre_dev_military

src/managements/competition/competionCustomize/index.jsx

@@ -82,6 +82,12 @@ function Competition(props){
           return text?'是':'否'
         }
       },
+      {
+        title: "排序",
+        dataIndex: "sort_no",
+        key: "sort_no",
+        align: "center",
+      },
       {
         title: '操作',
         dataIndex: 'id',

src/managements/competition/setting/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useCallback, useRef } from "react";
-import { Input, Row, Col, Button, Form, message, Spin, Checkbox, DatePicker, Upload, Icon } from 'antd';
+import { Input, Row, Col, Button, Form, message, Spin, Checkbox, DatePicker, Upload, Icon,InputNumber } from 'antd';
 import axios from "axios";
 import moment from 'moment';
 import MDEditor from 'src/modules/tpm/challengesnew/tpm-md-editor';
@@ -50,7 +50,8 @@ export default Form.create()(({ form, match, history, current_user, showNotifica
                         enroll_date: moment(details.enroll_date),
                         upload_date: moment(details.upload_date),
                         about_us: details.about_us,
-                        enroll_columns:details.enroll_columns
+                        enroll_columns:details.enroll_columns,
+                        sort_no:details.sort_no
                         // manager_ids: details.manager_ids,
                     };
                     setFieldsValue(initValue);
@@ -209,6 +210,12 @@ export default Form.create()(({ form, match, history, current_user, showNotifica
                     <Input placeholder="请输入参赛单位" onBlur={() => { verify("identifier") }} />
                 )}
 
+                {helper('排序号',
+                    'sort_no',
+                    [{ required: true, message: "请正确输入排序号" }],
+                    <InputNumber placeholder="请输入整数排序号" precision={0}/>
+                )}
+
                 <Form.Item className="video-box" label="Banner图">
                     <Row gutter={8}>
                         <Col span={12}>
@@ -343,14 +350,14 @@ export default Form.create()(({ form, match, history, current_user, showNotifica
                 {helper('赛区(内网)',
                     'zones_local',
                     [{ required: true, message: "请填写赛区，每个赛区之间以英文“,”隔开。如:赛区1,赛区2,赛区3" }],
-                    <Input placeholder="请填写赛区，每个赛区之间以英文“,”隔开。如:赛区1,赛区2,赛区3" onBlur={() => { verify("zones_local") }} onBlur={zonesChange} />,
+                    <Input placeholder="请填写赛区，每个赛区之间以英文“,”隔开。如:赛区1,赛区2,赛区3"  onBlur={zonesChange} />,
                     '请填写赛区，每个赛区之间以英文“,”隔开。如:赛区1,赛区2,赛区3'
                 )}
 
                 {helper('赛区(外网)',
                     'zones',
                     [{ required: true, message: "请填写赛区，每个赛区之间以英文“,”隔开。如:赛区1,赛区2,赛区3" }],
-                    <Input placeholder="请填写赛区，每个赛区之间以英文“,”隔开。如:赛区1,赛区2,赛区3" onBlur={() => { verify("zones") }} onBlur={zonesChange} />,
+                    <Input placeholder="请填写赛区，每个赛区之间以英文“,”隔开。如:赛区1,赛区2,赛区3"  onBlur={zonesChange} />,
                     '请填写赛区，每个赛区之间以英文“,”隔开。如:赛区1,赛区2,赛区3'
                 )}
 

src/managements/competition/setting/index.scss

@@ -28,4 +28,7 @@
     .ant-form-explain+.ant-form-extra{
         display: none !important;
     }
+    .ant-input-number{
+        width: 200px;
+    }
 }

src/military/task/taskList/index.jsx

@@ -277,7 +277,7 @@ export default ({ history, current_user, showLoginDialog, location, mygetHelmeta
         cancelButtonProps={null}
         closeIcon={<i className='iconfont icon-shanchuicon'></i>}
       >
-              <div className='profiles-tit'>您暂无发布权限，仅<span >平台指定企业</span>允许需求发布</div>
+              <div className='profiles-tit'>您暂无发布权限，仅<span >平台指定企业</span>允许需求提报</div>
               <img className='polify' src={polify} />
               <div className='profiles-content'>
                 若想发布需求，请在账号管理处<a href={`${mygetHelmetapi && mygetHelmetapi.main_web_site_url}/users/${current_user.login}/profiles`}>完善企业认证信息</a>，或<Link to={'/needs/new'}>点击此处</Link>提交需求申请信息，后续管理员将与您联系。