修改bug

src/military/fetch.js

@@ -6,9 +6,9 @@ import cookie from 'react-cookies';
 // export const httpUrl='http://192.168.31.72:8081';
 // export const httpUrl = 'http://106.75.31.211:58088';
 // export const httpUrl = 'http://192.168.31.72:8089';
-export const httpUrl = 'http://192.168.31.104:8081';
+// export const httpUrl = 'http://192.168.31.104:8081';
 
-// export const httpUrl = 'http://192.168.31.168:8081';
+export const httpUrl = 'http://192.168.31.168:8081';
 
 
 const TokenKey = 'autologin_forge_military';
@@ -18,7 +18,7 @@ const TokenKey = 'autologin_forge_military';
 // 创建axios实例
 const service = axios.create({
   baseURL: httpUrl,
-  timeout: 10000 // 请求超时时间
+  timeout: 10000, // 请求超时时间
 });
 service.defaults.withCredentials = true;
 

src/military/index.scss

@@ -174,6 +174,13 @@
   }
 }
 
+.ant-modal-body{
+  .ant-form-item-control-wrapper{
+    max-width: 80%;
+  }
+}
+
+
 
 @media screen and (max-width: 1200px){
   .centerbox {

src/military/task/agreementManage/index.js

@@ -6,14 +6,14 @@ import { agreementArr } from '../static';
 import { agreementList } from '../api';
 import '../index.scss';
 
-agreementArr.splice(1,1);
+const agreementOptionArr=agreementArr.slice(0,2);
 export default Form.create()(({ current_user, form, showNotification, match, history }) => {
   const { getFieldDecorator, validateFields, setFieldsValue, getFieldsValue } = form;
 
   const [approve, setApprove] = useState(1);
   const [loading, setLoading] = useState(false);
   const [searchObj, setSearchObj] = useState({});
-  const [status, setStatus] = useState('1');
+  const [status, setStatus] = useState('2');
   const [curPage, setCurPage] = useState(1);
   const [total, setTotal] = useState(0);
   const [taskList, setTaskList] = useState([]);
@@ -56,7 +56,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his
   }
 
   const changeOptionId = useCallback((option) => {
-    setStatus(option.dicItemCode.toString() || '0,2');
+    setStatus(option.dicItemCode.toString() || '0,1');
     setCurPage(1);
   }, []);
 
@@ -64,9 +64,9 @@ export default Form.create()(({ current_user, form, showNotification, match, his
     setApprove(approve);
     setCurPage(1);
     if (approve === 1) {
-      setStatus('1');
+      setStatus('2');
     } else {
-      setStatus('0,2');
+      setStatus('0,1');
     }
   }
 
@@ -130,7 +130,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his
           approve === 2 && <StatusNav
             key={'status'}
             type={'status'}
-            options={agreementArr}
+            options={agreementOptionArr}
             changeOptionId={changeOptionId}
           />
         }

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

@@ -54,10 +54,9 @@ export default Form.create()(props => {
       className="form-edit-modal"
     >
       <div className="task-popup-content">
-        <a href="http://117.50.100.12:8000/attachments/download/523/%E5%88%9B%E5%AE%A2%E4%BB%BB%E5%8A%A1%E5%88%97%E8%A1%A8_2019-07-26_20-53.xlsx" className="icon icon-attachment font-13 color-blue" length="32" target="_blank">协议样板</a>
+        <a href="http://117.50.100.12:8000/attachments/download/523/%E5%88%9B%E5%AE%A2%E4%BB%BB%E5%8A%A1%E5%88%97%E8%A1%A8_2019-07-26_20-53.xlsx" className="icon icon-attachment font-13 color-blue" length="32">协议样板.word</a>
         <Form.Item className="upload-form" label="附件上传" required={true}>
           <Upload
-            className="commentStyle"
             load={uploadFunc}
             size={50}
             showNotification={showNotification}

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

@@ -61,10 +61,10 @@ export default Form.create()((props) => {
       if (!err) {
         signMethod({
           taskId,
-          ...values,
+          method:values.method,
         }).then(res => {
           if (res && res.message === 'success') {
-            showNotification('签订成功');
+            showNotification('选择签订方式成功');
             setVisibleMethod(false);
             setFieldsValue({
               method: ''
@@ -177,7 +177,7 @@ export default Form.create()((props) => {
 
                     {item.status === 6 && item.agreementSigning === 0 && <a className="line_1 color-blue" onClick={() => { signMethodModal(item) }}>选择协议签订方式</a>}
 
-                    {item.status === 6 && <a className="line_1 color-blue" onClick={() => { uploadAgree(item) }}>上传委托协议</a>}
+                    {item.status === 6 && item.agreementSigning === 2 && <a className="line_1 color-blue" onClick={() => { uploadAgree(item) }}>上传委托协议</a>}
                     {/* <a href="javascript:void(0)" className="line_1 color-blue" onClick="paying_register_popup()">支付登记</a> */}
                     {/* <a href="javascript:void(0)" className="color-blue line_1">上传支付凭证</a> */}
                   </li>

src/military/task/index.scss

@@ -23,7 +23,6 @@
     }
   }
 
-
   .ant-select {
     min-width: 200px;
   }
@@ -42,7 +41,6 @@
     }
   }
 
- 
   .text-ellipsis-2 {
     text-overflow: -o-ellipsis-lastline;
     overflow: hidden;
@@ -54,8 +52,8 @@
   }
 }
 
-.ant-pagination{
-  margin:2rem auto;
+.ant-pagination {
+  margin: 2rem auto;
   text-align: center;
 }
 
@@ -66,11 +64,9 @@
   word-break: break-all;
 }
 
-// .ant-form-item-control-wrapper {
-//   display: inline-block;
-// }
-
-.upload-form{
+.upload-form {
   display: flex;
+  .ant-form-item-control-wrapper {
+    max-width: 80%;
+  }
 }
-

src/military/task/static.js

@@ -48,8 +48,8 @@ export const publicityArr=[
 
 export const agreementArr = [
   { dicItemCode: 0, name: "已驳回", dicItemName: "已驳回" },
-  { dicItemCode: 1, name: "待审核", dicItemName: "待审核" },
-  { dicItemCode: 2, name: "已同意", dicItemName: "已同意" },
+  { dicItemCode: 1, name: "已同意", dicItemName: "已同意" },
+  { dicItemCode: 2, name: "待审核", dicItemName: "待审核" },
 ]
 
 export const publishModeArr=["自主提交","统筹任务"];