From eef78ab88033f982a2f796ecc2497bd05f4fa4f4 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Mar 2022 11:39:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=90=E6=9E=9C=E7=94=B3=E8=AF=89?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/task/paperComplain/index.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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: '申诉文件', From 4344fcae0f59031841e3843213e024e03a414f8c Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 3 Mar 2022 13:56:05 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=88=90=E6=9E=9C=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=94=B3=E8=AF=89=E5=AE=A1=E6=89=B9=E5=88=97=E8=A1=A8=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E6=88=90=E6=9E=9C/=E8=AF=84=E8=AE=BA?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E4=B8=8D=E9=80=9A=E8=BF=87=E5=BC=B9=E6=A1=86?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/military/task/index.scss | 2 +- src/military/task/paperManage/index.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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/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: '', }) } From 66be86adc88bd8caf45396233b48d1d688fb1ef6 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 Mar 2022 11:00:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=93=E5=BA=93=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=BC=80=E6=BA=90=E8=AE=B8=E5=8F=AF=E8=AF=81?= =?UTF-8?q?=E5=85=A5=E5=8F=A3=E6=89=93=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Settings/Index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" : ""} >