lanjianrong 4 năm trước cách đây
mục cha
commit
6d822e7954

+ 3 - 6
src/pages/Product/Road/Enterprise/components/AddEnterprise/SearchCompanyInput.jsx

@@ -7,8 +7,7 @@ import { validateEnum } from '@/pages/Customer/Company/components/AddCompany/Com
 
 const SearchCompanyInput = ({ value, onChange, validateFn }) => {
   const [state, setState] = useState({
-    inputVal: value,
-    companylist: null
+    inputVal: value
   })
   const triggerChange = changedValue => {
     onChange?.(changedValue)
@@ -18,12 +17,10 @@ const SearchCompanyInput = ({ value, onChange, validateFn }) => {
     const { code = -1, data } = await queryRoadcompanyList({
       current: 1,
       pageSize: 20,
-      search,
-      waiver: true
+      search
     })
     if (code === consts.RET_CODE.SUCCESS) {
       const { list = [] } = data
-      setState({ ...state, companylist: list })
       if (list?.length) {
         validateFn(validateEnum.Error)
       } else {
@@ -39,7 +36,7 @@ const SearchCompanyInput = ({ value, onChange, validateFn }) => {
     const val = e.target.value || ''
     if (!val) {
       cancelQuerying()
-      setState({ ...state, inputVal: val, companylist: null })
+      setState({ ...state, inputVal: val })
       validateFn(validateEnum.Error)
     } else {
       setState({ ...state, inputVal: val })

+ 11 - 13
src/pages/Product/Road/Enterprise/components/AddEnterprise/index.jsx

@@ -21,10 +21,12 @@ const AddEnterprise = ({ visible, onCancel, onConfirm, ...resetModalProps }) =>
   const initData = () => {
     tRef.current.reset()
   }
+
   const [validStatus, setValidStatus] = useState({
-    companyName: '',
-    adminName: ''
+    companyName: null,
+    adminID: null
   })
+
   const handleOnOk = () => {
     formRef
       ?.validateFields()
@@ -63,7 +65,8 @@ const AddEnterprise = ({ visible, onCancel, onConfirm, ...resetModalProps }) =>
             确认
           </Button>
         </div>
-      }>
+      }
+    >
       <Form {...layout} form={formRef}>
         <Form.Item
           name="companyName"
@@ -72,17 +75,12 @@ const AddEnterprise = ({ visible, onCancel, onConfirm, ...resetModalProps }) =>
           validateStatus={validStatus.companyName}
           help={
             validStatus.companyName === validateEnum.Error ? '当前企业名称已存在,请重新输入' : null
-          }>
-          <SearchCompanyInput validateFn={status => setValidStatus(status)} />
+          }
+        >
+          <SearchCompanyInput
+            validateFn={status => setValidStatus({ ...validStatus, companyName: status })}
+          />
         </Form.Item>
-        {/* <Form.Item
-          name="companyName"
-          validateStatus={validStatusFcn}
-          hasFeedback
-          label="创建企业"
-          rules={[{ required: true }]}>
-          <EnterpriseFormItem validateFn={status => setValidStatusFcn(status)} />
-        </Form.Item> */}
         <Form.Item name="licenceNum" label="授权数量" rules={[{ required: true }]}>
           <InputNumber min={1} max={99} />
         </Form.Item>