Commit e800cca1 by zhaochengxiang

设计不通过 规范不允许改

parent 6121e09d
import React, { useState, useEffect, useRef, useMemo } from 'react'; import React, { useState, useEffect, useRef, useMemo } from 'react';
import { Form, Button, Space, Tooltip, Modal, Select, Input, } from 'antd'; import { Form, Button, Space, Tooltip, Modal, Select, Input } from 'antd';
import LocalStorage from 'local-storage'; import LocalStorage from 'local-storage';
import { useMount, useUnmount } from 'ahooks'; import { useMount, useUnmount } from 'ahooks';
import { LeftCircleFilled, RightCircleFilled } from '@ant-design/icons'; import { LeftCircleFilled, RightCircleFilled } from '@ant-design/icons';
...@@ -636,10 +636,12 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk, ...@@ -636,10 +636,12 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk,
<Button type='primary' onClick={onHistoryClick}>历史版本</Button> <Button type='primary' onClick={onHistoryClick}>历史版本</Button>
</Space> </Space>
<Space> <Space>
<Tooltip title={((type==='rule')&&!item?.designReviewPass) ? '设计评审不通过' : ''}>
<Select <Select
value={(type==='design')?item?.designReviewPass:item?.standardReviewPass} value={(type==='design')?item?.designReviewPass:item?.standardReviewPass}
placeholder='选择评审结论' placeholder='选择评审结论'
allowClear allowClear
disabled={(type==='rule')&&!item?.designReviewPass}
style={{ style={{
width: 150, width: 150,
}} }}
...@@ -658,8 +660,12 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk, ...@@ -658,8 +660,12 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk,
<Select.Option value={true}>通过</Select.Option> <Select.Option value={true}>通过</Select.Option>
<Select.Option value={false}>不通过</Select.Option> <Select.Option value={false}>不通过</Select.Option>
</Select> </Select>
</Tooltip>
<Tooltip title={((type==='rule')&&!item?.designReviewPass) ? '设计评审不通过' : ''}>
<Form.Item style={{ marginBottom: 0 }}>
<Input <Input
value={(type==='design')?item?.designReviewComment:item?.standardReviewComment} value={(type==='design')?item?.designReviewComment:item?.standardReviewComment}
disabled={(type==='rule')&&!item?.designReviewPass}
placeholder='请输入评审意见' placeholder='请输入评审意见'
style={{ width: 500 }} style={{ width: 500 }}
allowClear allowClear
...@@ -675,6 +681,8 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk, ...@@ -675,6 +681,8 @@ const PhysicalModelApprovalBottom = ({ loading, type, data, id, onChange, onOk,
}) })
}} }}
/> />
</Form.Item>
</Tooltip>
<Button loading={waiting} type='primary' onClick={onOkClick}>确定</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={<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> <Button type='text' icon={<RightCircleFilled className='pointer' style={{ fontSize: 26, color: canNext?'#196AD2':'#B5B5B5' }}/>} onClick={onNextClick} disabled={!canNext}></Button>
......
...@@ -259,9 +259,10 @@ const List = React.forwardRef(function ({type, data}, ref) { ...@@ -259,9 +259,10 @@ const List = React.forwardRef(function ({type, data}, ref) {
dataIndex: (type === 'design') ? 'designReviewPass' : 'standardReviewPass', dataIndex: (type === 'design') ? 'designReviewPass' : 'standardReviewPass',
width: 120, width: 120,
className: 'highlight', className: 'highlight',
render: (text, __, index) => { render: (text, record, index) => {
form?.setFieldsValue({ [`pass${index}`]: text }) form?.setFieldsValue({ [`pass${index}`]: text })
return ( return (
<Tooltip title={((type==='rule')&&!record.designReviewPass) ? '设计评审不通过' : ''}>
<Form.Item name={`pass${index}`} <Form.Item name={`pass${index}`}
rules={[{ required: true, message: '请选择评审结论!' }]} rules={[{ required: true, message: '请选择评审结论!' }]}
style={{ marginBottom: 0 }} style={{ marginBottom: 0 }}
...@@ -272,6 +273,7 @@ const List = React.forwardRef(function ({type, data}, ref) { ...@@ -272,6 +273,7 @@ const List = React.forwardRef(function ({type, data}, ref) {
style={{ style={{
width: '100%' width: '100%'
}} }}
disabled={(type==='rule')&&!record.designReviewPass}
onChange={(val) => { onChange={(val) => {
setTableData(prev => { setTableData(prev => {
return produce(prev, (draft) => { return produce(prev, (draft) => {
...@@ -288,6 +290,7 @@ const List = React.forwardRef(function ({type, data}, ref) { ...@@ -288,6 +290,7 @@ const List = React.forwardRef(function ({type, data}, ref) {
<Select.Option value={false}>不通过</Select.Option> <Select.Option value={false}>不通过</Select.Option>
</Select> </Select>
</Form.Item> </Form.Item>
</Tooltip>
) )
} }
}, },
...@@ -295,11 +298,14 @@ const List = React.forwardRef(function ({type, data}, ref) { ...@@ -295,11 +298,14 @@ const List = React.forwardRef(function ({type, data}, ref) {
title: '评审意见', title: '评审意见',
dataIndex: (type === 'design') ? 'designReviewComment' : 'standardReviewComment', dataIndex: (type === 'design') ? 'designReviewComment' : 'standardReviewComment',
className: 'highlight', className: 'highlight',
render: (text, __, index) => ( render: (text, record, index) => (
<Tooltip title={((type==='rule')&&!record.designReviewPass) ? '设计评审不通过' : ''}>
<Form.Item style={{ marginBottom: 0 }}>
<Input.TextArea rows={1} <Input.TextArea rows={1}
value={text} value={text}
autoSize={{ minRows: 1, maxRows: 3 }} autoSize={{ minRows: 1, maxRows: 3 }}
allowClear allowClear
disabled={(type==='rule')&&!record.designReviewPass}
onChange={(e) => { onChange={(e) => {
setTableData(prev => { setTableData(prev => {
return produce(prev, (draft) => { return produce(prev, (draft) => {
...@@ -312,6 +318,8 @@ const List = React.forwardRef(function ({type, data}, ref) { ...@@ -312,6 +318,8 @@ const List = React.forwardRef(function ({type, data}, ref) {
}) })
}} }}
/> />
</Form.Item>
</Tooltip>
) )
}, },
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment