上传创客issue修改

src/military/task/components/itemDelayManage/index.jsx

@@ -28,14 +28,9 @@ export default Form.create()((props) => {
   const { getFieldDecorator, validateFields } = form;
 
   const [checkedItem, setCheckedItem] = useState('');
-  const [page, setPage] = useState(1);
   const [visible, setVisible] = useState(false);
   const pageSize = props.pageSize || 10;
 
-  useEffect(() => {
-    changePage(page);
-  }, [page]);
-
   function closeClick(item) {
     Modal.confirm({
       title: '是否关闭?',
@@ -240,7 +235,7 @@ export default Form.create()((props) => {
           <div className="edu-txt-center mt20 mb20">
             {total > pageSize && <Pagination
               showQuickJumper
-              onChange={(page) => { setPage(page) }}
+              onChange={(page) => { changePage(page) }}
               current={curPage}
               total={total}
               showTotal={total => `共 ${total} 条`}

src/military/task/components/itemListPaper/index.jsx

@@ -121,6 +121,7 @@ export default Form.create()((props) => {
         confirmReceipt(paperId).then(res => {
           if (res && res.message === "success") {
             showNotification("您已确认收款！");
+            reloadList();
           }
         })
       }

src/military/task/components/itemListTask/index.jsx

@@ -36,7 +36,7 @@ export default (props) => {
                 <div className="list-content">
                   <div className="list-title mb10" onClick={() => { itemClick(item.id) }}>
                     <div className="title-content text-ellipsis">{item.name}</div>
-                    {item.status && <span className={classArr[item.status]}>{statusArr[item.status]}</span>}
+                    {item.status && <span className={classArr[item.status]}>{item.exceptClosedBoolean?'已关闭':statusArr[item.status]}</span>}
                     {(item.status !== 8) && item.delayTime.indexOf('延期') > -1 && <span className="list-yellow">延期中</span>}
                   </div>
                   <div className="list-other">

src/military/task/components/itemTaskManage/index.jsx

@@ -74,6 +74,20 @@ export default (props) => {
     window.location.href = `/users/${login}/message_detail`;
   }
 
+  function scale(scale) {
+    if (scale > 10000) {
+      return '10000人以上';
+    } else if (scale > 1000) {
+      return '1001 - 10000人';
+    } else if (scale > 100) {
+      return '101 - 1000人';
+    } else if (scale > 10) {
+      return '11 - 99人';
+    } else {
+      return '0 - 10人';
+    }
+  }
+
   return (
     loading ? <Loading /> :
       <React.Fragment>
@@ -128,7 +142,7 @@ export default (props) => {
                         </span>
                         <span className="inline-block lineh-35">
                           <span className="color-grey-9 fl">信用代码:</span>
-                          <span className="infos_item"></span>
+                          <span className="infos_item">{item.enterpriseSimple ? item.enterpriseSimple.creditCode : ''}</span>
                         </span>
                       </div>
                     </div>
@@ -149,14 +163,15 @@ export default (props) => {
                         <span className="color-grey-9 fl">所在行业:</span>
                         <span className="infos_item" style={{ maxWidth: '100px' }}>{categoryArr[item.categoryId]}</span>
                       </span>
-                      <span className="with25 fl lineh-35">
-                        <span className="color-grey-9 fl">企业规模:</span>
-                        <span className="infos_item" style={{ maxWidth: '100px' }}>0-10人</span>
-                      </span>
-                      <span className="inline-block lineh-35">
+                      {
+                        item.enterpriseSimple && <span className="with25 fl lineh-35">
+                          <span className="color-grey-9 fl">企业规模:</span>
+                          <span className="infos_item" style={{ maxWidth: '100px' }}>{scale(item.enterpriseSimple.scale)}</span>
+                        </span>}
+                      {/* <span className="inline-block lineh-35">
                         <span className="color-grey-9 fl">所在职位:</span>
                         <span className="infos_item">普通员工</span>
-                      </span>
+                      </span> */}
                     </div>
 
                   </ul>

src/military/task/myTask/joinTask.jsx

@@ -130,7 +130,7 @@ export default ({ taskCategoryValueArr, showNotification }) => {
               <Button type="danger" size="small" onClick={() => { setComplainVisible(true); setCheckedItem(record) }}>申诉</Button>
             }
 
-            {record.status === 2 && record.task.status === 6 && (record.task.agreementSigning === 1 || record.task.canApplicantSignByPlatform) &&
+            {record.status === 2 && record.task.status === 6 && (!record.sign) && (record.canApplicantSign || record.canApplicantSignByPlatform) &&
               < Button type="primary" size="small" onClick={() => { setAgreeVisible(true); setCheckedItem(record) }}>签订协议</Button>
             }