diff --git a/src/military/fetch.js b/src/military/fetch.js
index c709116e..418d3fbf 100644
--- a/src/military/fetch.js
+++ b/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;
diff --git a/src/military/index.scss b/src/military/index.scss
index 33849925..0b6e83e5 100644
--- a/src/military/index.scss
+++ b/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 {
diff --git a/src/military/task/agreementManage/index.js b/src/military/task/agreementManage/index.js
index 62d75e89..50eb9537 100644
--- a/src/military/task/agreementManage/index.js
+++ b/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 &&