From bec68aa0903e20710239f50d95e3af5ebfb61615 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 | 6 +++--- 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, 28 insertions(+), 26 deletions(-) delete mode 100644 src/military/task/components/agreementModal/index.scss 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 && } 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=["自主提交","统筹任务"];