diff --git a/src/forge/Settings/Index.js b/src/forge/Settings/Index.js index 78c4636df..ae9579117 100644 --- a/src/forge/Settings/Index.js +++ b/src/forge/Settings/Index.js @@ -113,7 +113,7 @@ class Index extends Component {

{ - false && projectDetail && projectDetail.permission && (projectDetail.permission === "Owner" || projectDetail.permission === "Admin") ? + projectDetail && projectDetail.permission && (projectDetail.permission === "Owner" || projectDetail.permission === "Admin") ?
  • -1 ? "active" : ""} > diff --git a/src/military/task/index.scss b/src/military/task/index.scss index 36be5da36..0744cbea3 100644 --- a/src/military/task/index.scss +++ b/src/military/task/index.scss @@ -88,7 +88,7 @@ span.list-gray { } .center-content .ant-pagination { - margin: 2rem auto; + margin: 2rem auto !important; text-align: center; .ant-pagination-item:focus, .ant-pagination-item:hover, .ant-pagination-item-active, .ant-pagination-prev:hover a, .ant-pagination-next:hover a, .ant-pagination-options-quick-jumper input:focus, .ant-pagination-options-quick-jumper input:hover{ border-color: #4154f1; diff --git a/src/military/task/paperComplain/index.js b/src/military/task/paperComplain/index.js index a8564856a..967826df8 100644 --- a/src/military/task/paperComplain/index.js +++ b/src/military/task/paperComplain/index.js @@ -95,16 +95,16 @@ export default Form.create()(({ form, showNotification, history}) => { const columns = useMemo(() => { return [ { - title: '序号', - dataIndex: 'index', - render: (text, record, index) => { - return index + 1 + title: '成果编号', + dataIndex: 'paperNumber', + render: (text, record) => { + return text ? {text} : '--' } }, { title: '申诉内容', dataIndex: 'content', - width: "30%", + width: "26%", }, { title: '申诉文件', diff --git a/src/military/task/paperManage/index.jsx b/src/military/task/paperManage/index.jsx index 6c26eda43..8f38481bd 100644 --- a/src/military/task/paperManage/index.jsx +++ b/src/military/task/paperManage/index.jsx @@ -90,7 +90,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his setReload(Math.random()); setVisible(false); setFieldsValue({ - pass: '', + pass: 2, message: '', }) }