|
@@ -3,7 +3,7 @@ import { Form, Row, Col, Button } from 'antd'
|
|
|
import LazyCascader from '@/components/LazyCascader'
|
|
import LazyCascader from '@/components/LazyCascader'
|
|
|
import { ProFormText, ProFormCheckbox, ProFormTextArea } from '@ant-design/pro-form'
|
|
import { ProFormText, ProFormCheckbox, ProFormTextArea } from '@ant-design/pro-form'
|
|
|
import { Plus } from '@icon-park/react'
|
|
import { Plus } from '@icon-park/react'
|
|
|
-import { connect } from 'dva'
|
|
|
|
|
|
|
+import { connect } from 'umi'
|
|
|
import { ChangeCompMap } from '../ChangeCompany'
|
|
import { ChangeCompMap } from '../ChangeCompany'
|
|
|
import ModalDragForm from '@/components/Modal/src/components/ModalDragForm'
|
|
import ModalDragForm from '@/components/Modal/src/components/ModalDragForm'
|
|
|
import { isNullOrUnDef } from '@/utils/is'
|
|
import { isNullOrUnDef } from '@/utils/is'
|
|
@@ -48,7 +48,8 @@ const AddCompanyModal = ({ reload, dataId, dataType, onConfirm, dispatch, nature
|
|
|
}
|
|
}
|
|
|
formRef.current && formRef.current.setFieldsValue(values)
|
|
formRef.current && formRef.current.setFieldsValue(values)
|
|
|
submit()
|
|
submit()
|
|
|
- }}>
|
|
|
|
|
|
|
+ }}
|
|
|
|
|
+ >
|
|
|
添加并关联
|
|
添加并关联
|
|
|
</Button>
|
|
</Button>
|
|
|
) : null
|
|
) : null
|
|
@@ -65,19 +66,22 @@ const AddCompanyModal = ({ reload, dataId, dataType, onConfirm, dispatch, nature
|
|
|
formRef.current?.resetFields()
|
|
formRef.current?.resetFields()
|
|
|
!isNullOrUnDef(reload) && reload()
|
|
!isNullOrUnDef(reload) && reload()
|
|
|
return true
|
|
return true
|
|
|
- }}>
|
|
|
|
|
|
|
+ }}
|
|
|
|
|
+ >
|
|
|
<Form.Item
|
|
<Form.Item
|
|
|
name="companyName"
|
|
name="companyName"
|
|
|
label="单位名称"
|
|
label="单位名称"
|
|
|
placeholder="请输入单位全称"
|
|
placeholder="请输入单位全称"
|
|
|
- rules={[{ required: true, message: '请输入单位全称' }]}>
|
|
|
|
|
|
|
+ rules={[{ required: true, message: '请输入单位全称' }]}
|
|
|
|
|
+ >
|
|
|
<CompanyFormItem />
|
|
<CompanyFormItem />
|
|
|
</Form.Item>
|
|
</Form.Item>
|
|
|
{showDataItem ? <ProFormText name={`${dataType}Id`} hidden /> : null}
|
|
{showDataItem ? <ProFormText name={`${dataType}Id`} hidden /> : null}
|
|
|
<Form.Item
|
|
<Form.Item
|
|
|
name="districtIds"
|
|
name="districtIds"
|
|
|
label="单位地区"
|
|
label="单位地区"
|
|
|
- rules={[{ required: true, message: '请选择地区' }]}>
|
|
|
|
|
|
|
+ rules={[{ required: true, message: '请选择地区' }]}
|
|
|
|
|
+ >
|
|
|
<LazyCascader showFooter={true} />
|
|
<LazyCascader showFooter={true} />
|
|
|
</Form.Item>
|
|
</Form.Item>
|
|
|
<ProFormText
|
|
<ProFormText
|