Commit 2eb91173 by zhaochengxiang

优化意见

parent af470abf
......@@ -146,67 +146,72 @@ const Basic = React.forwardRef(function ({}, ref) {
return (
<Form
form={form}
labelCol={{ span: 3 }}
wrapperCol={{ span: 9 }}
labelCol={{ span: 6 }}
wrapperCol={{ span: 18 }}
autoComplete="off"
onValuesChange={onValuesChange}
>
<Form.Item
label='送审说明'
name="sendReviewExplain"
style={{ marginBottom }}
rules={[{ required: true, message: '请填写送审说明!' }]}
>
<Input placeholder='请输入送审说明' />
</Form.Item>
<Form.Item
label='设计评审人员'
name="designApprovalUserList"
style={{ marginBottom }}
rules={[{ required: true, message: '请选择设计评审人员!' }]}
>
<DesignUsersItem />
</Form.Item>
<Form.Item
label='规范评审'
name='standard'
wrapperCol={{ span: 12 }}
style={{ marginBottom }}
rules={[{
required: true,
validator: (_, value) => {
if (value?.requiresStandardApproval === null || value?.requiresStandardApproval === undefined) {
return Promise.reject(new Error('请选择是否规范评审!'))
}
if (value?.requiresStandardApproval && (value?.standardApprovalUserList??[]).length === 0) {
return Promise.reject(new Error('请选择规范评审人员!'))
}
return Promise.resolve();
}
}]}
>
<RuleReviewItem />
</Form.Item>
<Form.Item
label='附件'
style={{ marginBottom }}
>
<Upload {...uploadProps }>
<Button icon={<UploadOutlined />}>点击上传</Button>
</Upload>
</Form.Item>
<Form.Item
label='已上传附件'
name='fileList'
>
<AttachesItem />
</Form.Item>
<Row gutter={10}>
<Col span={12}>
<Form.Item
label='设计评审人员'
name="designApprovalUserList"
style={{ marginBottom }}
rules={[{ required: true, message: '请选择设计评审人员!' }]}
>
<DesignUsersItem />
</Form.Item>
<Form.Item
label='规范评审'
name='standard'
wrapperCol={{ span: 12 }}
style={{ marginBottom }}
rules={[{
required: true,
validator: (_, value) => {
if (value?.requiresStandardApproval === null || value?.requiresStandardApproval === undefined) {
return Promise.reject(new Error('请选择是否规范评审!'))
}
if (value?.requiresStandardApproval && (value?.standardApprovalUserList??[]).length === 0) {
return Promise.reject(new Error('请选择规范评审人员!'))
}
return Promise.resolve();
}
}]}
>
<RuleReviewItem />
</Form.Item>
<Form.Item
label='附件'
style={{ marginBottom }}
>
<Upload {...uploadProps }>
<Button icon={<UploadOutlined />}>点击上传</Button>
</Upload>
</Form.Item>
<Form.Item
label='已上传附件'
name='fileList'
>
<AttachesItem />
</Form.Item>
</Col>
<Col span={12}>
<Form.Item
label='送审说明'
name="sendReviewExplain"
style={{ marginBottom }}
rules={[{ required: true, message: '请填写送审说明!' }]}
>
<Input.TextArea rows={7} placeholder='请输入送审说明' />
</Form.Item>
</Col>
</Row>
</Form>
)
})
......@@ -431,7 +436,7 @@ const DesignUsersItem = ({ value, onChange }) => {
return (
<Select showSearch allowClear
placeholder='请选择设计评审人员'
placeholder='请选择设计评审人员(只能选择一人)'
value={value?.map(item => item.name)}
searchValue={searchValue}
onSearch={(val) => {
......
......@@ -25,7 +25,7 @@ const FC = (props) => {
triggerType: undefined,
})
const [columns, setColumns] = React.useState([])
const [isCompact, setCompact] = React.useState(true)
const [isCompact, setCompact] = React.useState(false)
const cols = [
{
......@@ -247,7 +247,7 @@ const FC = (props) => {
setLoadingPreference(false)
setLoading(false)
setAnimating(false)
setCompact(true)
setCompact(false)
setPreference()
setSuggests()
setOffset(1)
......@@ -313,12 +313,12 @@ const FC = (props) => {
style={{ width: inputWidth }}
/>
</Space>
<Button
{/* <Button
icon={isCompact ? <ArrowsAltOutlined /> : <ShrinkOutlined />}
onClick={() => {
setCompact(prev => !prev)
}}
/>
/> */}
</div>
<Spin spinning={loading||loadingPreference}>
<div style={{ height: isCompact?'50vh':'80vh', overflow: 'auto' }}>
......
......@@ -158,7 +158,7 @@ const FC = (props) => {
style={{ marginBottom: 0 }}
>
<Input.TextArea
autoSize={{ minRows: 1, maxRows: 20 }}
rows={4}
allowClear
placeholder='请输入流程意见'
/>
......
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