修改延期代码

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

@@ -25,7 +25,7 @@ function getSomeDayAfter(time, nDay) {
 export default Form.create()((props) => {
 
   const { list, curPage, total, changePage, loading, showNotification, reloadList, form } = props;
-  const { getFieldDecorator, validateFields} = form;
+  const { getFieldDecorator, validateFields } = form;
 
   const [checkedItem, setCheckedItem] = useState('');
   const [page, setPage] = useState(1);
@@ -57,12 +57,12 @@ export default Form.create()((props) => {
   }
 
   function delayTime() {
-    validateFields((err,values)=>{
+    validateFields((err, values) => {
-      if(!err){
+      if (!err) {
         delayTask({
           taskId: checkedItem.id,
-          params:{
+          params: {
-            delayedTo:moment(values.delayedTo).format(format)
+            delayedTo: moment(values.delayedTo).format(format)
           },
         }).then(res => {
           if (res && res.message === 'success') {
@@ -112,7 +112,7 @@ export default Form.create()((props) => {
         surplus = 0;
     }
     let surplusTimetext = formatDuring(surplus);
-    return surplus > 0 ? '剩余' + surplusTimetext : <span>延期<span className="color-red">{surplusTimetext}</span></span>;
+    return surplus > 0 ? '剩余' + surplusTimetext : <span>延期 <span className="color-red">{surplusTimetext}</span></span>;
   }, []);
 
   const stopTime = useCallback((item) => {
@@ -134,6 +134,9 @@ export default Form.create()((props) => {
     }
   })
 
+  function disabledDate(current) {
+    return current && current < moment().endOf('day');
+  }
 
   return (
     loading ? <Loading /> :
@@ -191,11 +194,25 @@ export default Form.create()((props) => {
 
                     <span className="with40 fl lineh-35 color-orange">
                       {
-                        item.status === 7 && item.agreementSigning === 2 && '未上传支付报酬凭证'
+                        item.status === 4 && item.papersCount > 0 && (!item.isProofBoolean) && '未上传佐证材料'
+                      }
+
+                      {item.status === 6 && item.agreementSigning === 0 && '未选择协议签订方式'}
+
+                      {
+                        item.status === 6 && item.agreementSigning === 2 && (item.contractStatus === null || item.contractStatus === 0) && '未上传委托协议'
                       }
 
                       {
-                        // item.status === 6 && item.agreementSigning === 2 && '未上传支付报酬凭证'
+                        item.status === 6 && item.agreementSigning === 2 && item.contractStatus === 2 && '已上传委托协议'
+                      }
+
+                      {
+                        item.status === 6 && item.agreementSigning === 2 && item.contractStatus === 2 && '已上传协议签订凭证'
+                      }
+
+                      {
+                        item.status === 7 && item.agreementSigning === 2 && '未上传支付报酬凭证'
                       }
                     </span>
                   </div>
@@ -249,6 +266,7 @@ export default Form.create()((props) => {
             <DatePicker
               format={format}
               placeholder="请选择日期"
+              disabledDate={disabledDate}
             />,
             moment(new Date(), format)
           )}

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

@@ -37,11 +37,11 @@ a.primary-link {
   padding: 0px 10px;
   margin-left: .625rem;
   background: #f8c753;
-  font-size: .75rem;
+  font-size: 12px;
   color: #fff;
   border-radius: 14px;
-  line-height: 26px;
+  line-height: 22px;
-  height: 26px;
+  height: 22px;
 }
 
 .time-edit-modal .ant-modal-body{

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

@@ -45,27 +45,7 @@
   color: #fff;
   border-radius: 14px;
 }
-span.list-yellow {
+
-  background: #fa6400;
-}
-span.list-red {
-  background: #fe0e36;
-}
-span.list-orange {
-  background: #ffb121;
-}
-span.list-done {
-  background: #35d77e;
-}
-span.list-pay {
-  background: #1ad757;
-}
-span.list-error {
-  background: #f56c6c;
-}
-span.list-gray {
-  background: #bababa;
-}
 
 .list-other {
   font-size: 12px;

src/military/task/delayManage/index.js

@@ -11,7 +11,7 @@ const { Search } = Input;
 
 export default ({ current_user,  showNotification,  history }) => {
   const [operationStatus, setOperationStatus] = useState(0);
-  const [taskModeId, setTaskModeId] = useState('');
+  const [publicMode, setPublicMode] = useState('');
   const [cancelStatus, setCancelStatus] = useState('');
 
   const [loading, setLoading] = useState(false);
@@ -30,7 +30,7 @@ export default ({ current_user,  showNotification,  history }) => {
       status,
       curPage,
       pageSize: 10,
-      taskModeId,
+      publicMode,
       cancelStatus,
     };
     setLoading(true);
@@ -41,7 +41,7 @@ export default ({ current_user,  showNotification,  history }) => {
       }
       setLoading(false);
     })
-  }, [reload, operationStatus, taskModeId, cancelStatus, status, curPage,]);
+  }, [reload,searchInput, operationStatus, publicMode, cancelStatus, status, curPage,]);
 
 
   const changeTaskStatus = useCallback((option) => {
@@ -87,9 +87,9 @@ export default ({ current_user,  showNotification,  history }) => {
 
       <div className="center-screen flex-column" >
         <div className="center-left-but">
-          <Button className="circle-button" type={taskModeId === '' ? 'primary' : ''} onClick={() => { setTaskModeId('') }}>全部</Button>
+          <Button className="circle-button" type={publicMode === '' ? 'primary' : ''} onClick={() => { setPublicMode('') }}>全部</Button>
-          <Button className="circle-button" type={taskModeId === 1 ? 'primary' : ''} onClick={() => { setTaskModeId(1) }}>统筹任务</Button>
+          <Button className="circle-button" type={publicMode === 1 ? 'primary' : ''} onClick={() => { setPublicMode(1) }}>统筹任务</Button>
-          <Button className="circle-button" type={taskModeId === 2 ? 'primary' : ''} onClick={() => { setTaskModeId(2) }}>自主提交任务</Button>
+          <Button className="circle-button" type={publicMode === 0 ? 'primary' : ''} onClick={() => { setPublicMode(0) }}>自主提交任务</Button>
         </div>
 
         {

src/military/task/index.scss

@@ -18,11 +18,14 @@
     .ant-form-item-control-wrapper {
       display: inline-block;
     }
+    .status-item{
+      margin-right: 2rem;
+    }
   }
   .center-left-but {
     .circle-button {
       border-radius: 1rem;
-      margin-right: 0.5rem;
+      margin-right: 2rem;
     }
   }
 
@@ -62,6 +65,28 @@
   }
 }
 
+span.list-yellow {
+  background: #fa6400;
+}
+span.list-red {
+  background: #fe0e36;
+}
+span.list-orange {
+  background: #ffb121;
+}
+span.list-done {
+  background: #35d77e;
+}
+span.list-pay {
+  background: #1ad757;
+}
+span.list-error {
+  background: #f56c6c;
+}
+span.list-gray {
+  background: #bababa;
+}
+
 .ant-pagination {
   margin: 2rem auto;
   text-align: center;