Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
szse
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaochengxiang
szse
Commits
b4a64d27
Commit
b4a64d27
authored
Mar 14, 2024
by
zhaochengxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
评审模型详情增加版本历史
parent
cabbef77
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
59 additions
and
8 deletions
+59
-8
EditModel.jsx
src/view/Manage/Model/Component/EditModel.jsx
+48
-8
index.jsx
src/view/Manage/ModelReview/index.jsx
+11
-0
No files found.
src/view/Manage/Model/Component/EditModel.jsx
View file @
b4a64d27
...
...
@@ -334,6 +334,9 @@ const EditModel = (props) => {
title
=
'模型编辑'
;
}
else
if
(
action
===
'detail'
||
action
===
'flow'
)
{
title
=
'模型详情'
;
if
(
approvalData
)
{
title
=
`
${
approvalData
?.
creator
?.
userName
??
''
}
发起的物理模型评审流程
-
$
{
approvalType
===
'design'
?
'设计评审'
:
'规范评审'
}
-
模型详情
`
}
} else if (action === 'detail-version') {
title = '模型版本详情';
}
...
...
@@ -450,9 +453,15 @@ const EditModel = (props) => {
data={approvalData}
id={currentApprovalModelId}
type={approvalType}
onHistory={() => {
setHistoryAndVersionDrawerVisible(true)
}}
onChange={(val) => {
setApprovalModelId(val)
}}
onOk={() => {
getApprovalDetail()
}}
/>
} else {
actionsBtn = (
...
...
@@ -555,8 +564,9 @@ const EditModel = (props) => {
export default EditModel;
const
PhysicalModelApprovalBottom
=
({
loading
,
type
,
data
,
id
,
onChange
,
onOk
})
=>
{
const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk
, onHistory
}) => {
const [item, setItem] = useState()
const [waiting, setWaiting] = useState(false)
useEffect(() => {
if (data && id) {
...
...
@@ -578,6 +588,10 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk }
return [0, false, false]
}, [data, id])
const onHistoryClick = () => {
onHistory?.()
}
const onPrevClick = () => {
if (data?.modelInfoList[index-1]) {
onChange?.(data?.modelInfoList[index-1].id)
...
...
@@ -590,10 +604,36 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk }
}
}
const onOkClick = () => {
setWaiting(true);
let newModelInfoList = [...data?.modelInfoList??[]];
(newModelInfoList??[]).splice(index, 1, item);
dispatch({
type: 'datamodel.updatePhysicalModelApproval',
payload: {
params: {
physicalModelApprovalId: data?.id,
},
data: newModelInfoList,
},
callback: (data) => {
setWaiting(false)
showMessage('success', '保存成功')
onOk?.()
LocalStorage.set('approvalChange', !LocalStorage.get('approvalChange'));
},
error: () => {
setWaiting(false)
}
})
}
return (
<
div
className=
'flex'
style=
{
{
justifyContent
:
'space-between'
}
}
>
<div className='flex' style={{
width: '100%',
justifyContent: 'space-between' }}>
<Space>
<Button type='primary' onClick={onHistoryClick}>版本历史</Button>
</Space>
<Space>
<Select
...
...
@@ -618,10 +658,10 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk }
<Select.Option value={true}>通过</Select.Option>
<Select.Option value={false}>不通过</Select.Option>
</Select>
<
Input
.
TextArea
rows=
{
1
}
<Input
value={(type==='design')?item?.designReviewComment:item?.standardReviewComment}
placeholder='请输入评审意见'
autoSize=
{
{
minRows
:
1
,
maxRows
:
3
}
}
style={{ width: 500
}}
allowClear
onChange={(e) => {
setItem(prev => {
...
...
@@ -635,9 +675,9 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk }
})
}}
/>
<
Button
type=
'primary'
>
确定
</
Button
>
<
Button
type=
'text'
icon=
{
<
LeftCircleFilled
className=
'pointer'
style=
{
{
fontSize
:
26
,
color
:
'#196AD2
'
}
}
/>
}
onClick=
{
onPrevClick
}
disabled=
{
!
canPrev
}
></
Button
>
<
Button
type=
'text'
icon=
{
<
RightCircleFilled
className=
'pointer'
style=
{
{
fontSize
:
26
,
color
:
'#196AD2
'
}
}
/>
}
onClick=
{
onNextClick
}
disabled=
{
!
canNext
}
></
Button
>
<Button
loading={waiting} type='primary' onClick={onOkClick}
>确定</Button>
<Button type='text' icon={<LeftCircleFilled className='pointer' style={{ fontSize: 26, color:
canPrev?'#196AD2':'#B5B5B5
' }}/>} onClick={onPrevClick} disabled={!canPrev}></Button>
<Button type='text' icon={<RightCircleFilled className='pointer' style={{ fontSize: 26, color:
canNext?'#196AD2':'#B5B5B5
' }}/>} onClick={onNextClick} disabled={!canNext}></Button>
</Space>
</div>
)
...
...
src/view/Manage/ModelReview/index.jsx
View file @
b4a64d27
...
...
@@ -21,8 +21,19 @@ const FC = (props) => {
React
.
useEffect
(()
=>
{
getDetail
()
window
?.
addEventListener
(
"storage"
,
storageChange
);
return
()
=>
{
window
?.
removeEventListener
(
"storage"
,
storageChange
)
}
},
[])
const
storageChange
=
(
e
)
=>
{
if
(
e
.
key
===
'approvalChange'
)
{
getDetail
()
}
}
const
getDetail
=
()
=>
{
setLoading
(
true
)
dispatch
({
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment