From 981e199273dd4dddfff0c8cb75da074556eaae4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Wed, 14 Jul 2021 10:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/military/fetch.js | 2 +-
src/military/index.scss | 7 +++++++
src/military/task/agreementManage/index.js | 12 ++++++------
.../task/components/agreementModal/index.jsx | 3 +--
.../task/components/agreementModal/index.scss | 0
.../task/components/itemListMyTask/index.jsx | 6 +++---
src/military/task/index.scss | 16 ++++++----------
src/military/task/static.js | 4 ++--
8 files changed, 26 insertions(+), 24 deletions(-)
delete mode 100644 src/military/task/components/agreementModal/index.scss
diff --git a/src/military/fetch.js b/src/military/fetch.js
index 4a8900e3..bb159c3e 100644
--- a/src/military/fetch.js
+++ b/src/military/fetch.js
@@ -22,7 +22,7 @@ axios.defaults.withCredentials = true;
// 创建axios实例
const service = axios.create({
baseURL: httpUrl,
- timeout: 10000 // 请求超时时间
+ timeout: 10000, // 请求超时时间
});
// request拦截器
diff --git a/src/military/index.scss b/src/military/index.scss
index 3dae0f66..6361b569 100644
--- a/src/military/index.scss
+++ b/src/military/index.scss
@@ -227,6 +227,13 @@
}
}
+.ant-modal-body{
+ .ant-form-item-control-wrapper{
+ max-width: 80%;
+ }
+}
+
+
@media screen and (max-width: 1200px){
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 &&
}
diff --git a/src/military/task/components/agreementModal/index.jsx b/src/military/task/components/agreementModal/index.jsx
index 99c08c24..d5e95a19 100644
--- a/src/military/task/components/agreementModal/index.jsx
+++ b/src/military/task/components/agreementModal/index.jsx
@@ -54,10 +54,9 @@ export default Form.create()(props => {
className="form-edit-modal"
>
-
协议样板
+
协议样板.word
{
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 && { signMethodModal(item) }}>选择协议签订方式}
- {item.status === 6 && { uploadAgree(item) }}>上传委托协议}
+ {item.status === 6 && item.agreementSigning === 2 && { uploadAgree(item) }}>上传委托协议}
{/* 支付登记 */}
{/* 上传支付凭证 */}
diff --git a/src/military/task/index.scss b/src/military/task/index.scss
index e2da2463..c53f8947 100644
--- a/src/military/task/index.scss
+++ b/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%;
+ }
}
-
diff --git a/src/military/task/static.js b/src/military/task/static.js
index 57d768de..8bb0c738 100644
--- a/src/military/task/static.js
+++ b/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=["自主提交","统筹任务"];