From 6ffddb4f427176d39bb41df21919d7038e5bf668 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 11 Sep 2024 15:27:19 +0800
Subject: [PATCH] feat: 修改样式
---
gz-customerSystem/src/components/ProgressStep/VisitStep.jsx | 2 +-
gz-customerSystem/src/views/register/visit/preview.jsx | 4 +---
gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx | 4 ++--
gz-customerSystem/src/views/register/visit/index.jsx | 2 +-
gz-customerSystem/src/views/register/index.jsx | 23 ++++++++++++++++-------
gz-customerSystem/src/utils/utility.js | 4 ++--
6 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx b/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx
index 14e906f..918b953 100644
--- a/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx
+++ b/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx
@@ -90,7 +90,7 @@
}
<div className="myStep-item-p" style={{ color: 'rgba(0,0,0,0.50)' }}>
<span>操作时间：</span>
- <span>{$$.timeFormat(x.handleTime)}</span>
+ <span>{$$.timeFormat(x.handleTime, false, 'YYYY-MM-DD HH:mm')}</span>
</div>
{
x.handleNotes &&
diff --git a/gz-customerSystem/src/utils/utility.js b/gz-customerSystem/src/utils/utility.js
index 8eebc56..4728488 100644
--- a/gz-customerSystem/src/utils/utility.js
+++ b/gz-customerSystem/src/utils/utility.js
@@ -180,8 +180,8 @@
}
// 时间格式化
-export function timeFormat(value, isValue) {
- return !!value ? moment(value).format('YYYY-MM-DD HH:mm:ss') : isValue ? '' : '-';
+export function timeFormat(value, isValue, timeFormat) {
+ return !!value ? moment(value).format(timeFormat ? timeFormat : 'YYYY-MM-DD HH:mm:ss') : isValue ? '' : '-';
}
export function dateFormat(value) {
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index e60ca7b..844aef1 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -167,6 +167,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
@@ -228,6 +229,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
@@ -287,6 +289,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
@@ -345,6 +348,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
@@ -404,6 +408,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
@@ -463,6 +468,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
@@ -522,6 +528,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
@@ -596,6 +603,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer', color: '#1A6FB8' }}>详情</div>
@@ -658,6 +666,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
@@ -737,6 +746,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space>
<div>回复</div>
@@ -807,6 +817,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
@@ -876,6 +887,7 @@
dataIndex: 'actions',
key: 'actions',
width: 180,
+ fixed: 'right',
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
@@ -1116,10 +1128,7 @@
size="small"
rowKey="caseId"
bordered={true}
- // style={{ marginBottom: '65px', marginTop: '-16px' }}
- // rowSelection={{
- // type: 'Checkbox'
- // }}
+ scroll={{ x: 1300 }}
/>
</Typography.Paragraph>
</TabPane>
@@ -1143,7 +1152,7 @@
size="small"
rowKey="id"
bordered={true}
- // style={{ marginBottom: '65px', marginTop: '-16px' }}
+ scroll={{ x: 1300 }}
/>
</Typography.Paragraph>
</TabPane>
@@ -1163,7 +1172,7 @@
size="small"
rowKey="id"
bordered={true}
- // style={{ marginBottom: '65px', marginTop: '-16px' }}
+ scroll={{ x: 1300 }}
/>
</Typography.Paragraph>
</TabPane>
@@ -1176,7 +1185,7 @@
群众来访接待
<div style={{ display: 'flex', justifyContent: 'space-evenly',gap:'24px',marginTop:'16px' }}>
<div className='bottomTab1' style={{ cursor: 'pointer' }}>
- <div className='VisitWorkBench-bottom-title' onClick={() => navigate(`/mediate/visit`)} style={{ color: '#206BCD' }}>大厅来访</div>
+ <div className='VisitWorkBench-bottom-title' onClick={() => {navigate(`/mediate/visit`)}} style={{ color: '#206BCD' }}>大厅来访</div>
{/* <img src={visitInto} alt='' className='VisitWorkBench-bottom-img' /> */}
</div>
<div className='bottomTab2' style={{ cursor: 'pointer' }}>
diff --git a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
index 0c26ef2..b83c55b 100644
--- a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
@@ -179,11 +179,11 @@
</div>
}
{caseInfo?.canal === '22_00001-1' &&
- <div style={{ backgroundColor: '#ffff', margin: '8px 16px 65px 16px', padding: '12px' }}>
+ <div style={{ backgroundColor: '#ffff', margin: '8px 16px 0px 16px', padding: '12px' }}>
<RegisInfoModule caseInfo={caseInfo} />
</div>
-
}
+ <div style={{ backgroundColor: '#ffff', margin: '0 16px 64px 16px', padding: '12px' }}></div>
</Scrollbars>
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 08aa69f..9307633 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -198,7 +198,7 @@
<Step title='结案归档' disabled />
</Steps>
</div>
- <div style={{ backgroundColor: '#ffff', margin: '8px 8px 0px 16px', padding: '12px 18px 16px 16px', height: 'calc(100vh - 228px)', overflowY: 'scroll', display: isReview ? '' : 'none' }}>
+ <div style={{ backgroundColor: '#ffff', margin: '8px 8px 0px 16px', padding: '12px 18px 82px 16px', height: 'calc(100vh - 228px)', overflowY: 'scroll', display: isReview ? '' : 'none' }}>
<Preview style={{ display: isReview ? '' : 'none' }} data={formRef?.current?.getFields()} mainId={id} />
</div>
<VisitorRegister
diff --git a/gz-customerSystem/src/views/register/visit/preview.jsx b/gz-customerSystem/src/views/register/visit/preview.jsx
index 60d498f..a4653b1 100644
--- a/gz-customerSystem/src/views/register/visit/preview.jsx
+++ b/gz-customerSystem/src/views/register/visit/preview.jsx
@@ -235,9 +235,7 @@
<div className='MediationInfo-subTitle' style={{ marginTop: '-7px' }}></div><h4>事件材料</h4>
</Space>
</Col>
- <div style={{ marginBottom: '65px' }}>
- <FileTable mainId={props.mainId} fileInfoList={props.data?.fileInfoList} isReview={true} />
- </div>
+ <FileTable mainId={props.mainId} fileInfoList={props.data?.fileInfoList} isReview={true} />
</div>
)
}
--
Gitblit v1.8.0