feat: 大司空企业版添加企业

src/pages/Product/Road/Enterprise/components/AddEnterprise/SearchCompanyInput.jsx

@@ -21,6 +21,7 @@ const SearchCompanyInput = ({ value, onChange, disabled, validateFn }) => {
     })
     if (code === consts.RET_CODE.SUCCESS) {
       const { list = [] } = data
+      console.log(data)
       if (list?.length) {
         validateFn(validateEnum.Error)
       } else {

src/pages/Product/Road/Enterprise/components/AddEnterprise/index.jsx

@@ -39,7 +39,7 @@ const AddEnterprise = ({
   const selectProps = {
     mode: 'multiple',
     style: { width: '100%' },
-    options: compilationv2.map(item => ({ label: item.name, value: item._id })),
+    options: compilationv2.map(item => ({ label: item.name, value: item.ID })),
     placeholder: '请选择授权定额',
     maxTagCount: 'responsive'
   }
@@ -71,7 +71,7 @@ const AddEnterprise = ({
         } catch (error) {}
       })
       .catch(({ values }) => {
-        if ('companyName' in values && !values.companyName) {
+        if ('name' in values && !values.companyName) {
           setValidStatus(validateEnum.Error)
         }
       })
@@ -96,7 +96,7 @@ const AddEnterprise = ({
       }>
       {/* initialValues={{ licenceNum: 1 }} */}
       <Form {...layout} form={formRef} initialValues={defaultValues}>
-        <ProFormText name="companyId" hidden />
+        <ProFormText name="adminID" hidden />
         <Form.Item
           name="companyName"
           label="创建企业"
@@ -121,7 +121,7 @@ const AddEnterprise = ({
             <Select {...selectProps} disabled={disabled} />
           </Space>
         </Form.Item>
-        <Form.Item
+        {/* <Form.Item
           name="adminID"
           label="管理员名称"
           hasFeedback
@@ -132,7 +132,7 @@ const AddEnterprise = ({
             validateFn={status => setValidStatus({ ...validStatus, adminID: status })}
             disabled={disabled}
           />
-        </Form.Item>
+        </Form.Item> */}
       </Form>
     </Modal>
   )

src/pages/Product/Road/Enterprise/components/Detail/Form.jsx

@@ -5,7 +5,17 @@ import React from 'react'
 
 const EnterpriseForm = props => {
   const { company, updateKey } = props
-  console.log(company.members?.find(item => item.role === 'admin')?.memberName)
+  const dataSource = {
+    name: company.name,
+    mobile: company.members?.find(item => item.role === 'admin')?.memberName,
+    subdomain: company.subdomain,
+    licenceNum: company.licenceNum,
+    surplus: (company.licenceNum - company.members?.length).toString(),
+    // surplus: (company.licenceNum - (company.members?.length || 0)).toString(),
+    location: company.location?.join(' / '),
+    type: company.type,
+    scale: company.scale
+  }
   const columns = [
     {
       dataIndex: 'name',
@@ -32,13 +42,13 @@ const EnterpriseForm = props => {
       span: 24
     },
     {
-      dataIndex: 'a3',
+      dataIndex: 'surplus',
       label: '剩余可用',
       editable: false,
       span: 24
     },
     {
-      dataIndex: 'a4',
+      dataIndex: 'location',
       label: '企业地区',
       editable: false,
       span: 24
@@ -70,7 +80,7 @@ const EnterpriseForm = props => {
         </Col>
         <Col span={2} />
       </Row>
-      <EditableForm dataSource={company} columns={columns} tartgetUrl="/cloud/update" type={updateKey} />
+      <EditableForm dataSource={dataSource} columns={columns} tartgetUrl="/cloud/update" type={updateKey} />
     </div>
   )
 }