ソースを参照

feat: 大司空企业版创建企业+编辑企业

outaozhen 4 年 前
コミット
0bcaa703e9

+ 1 - 1
src/pages/Product/Road/Enterprise/components/AddEnterprise/EnterpriseSearchSelect.jsx

@@ -45,7 +45,7 @@ const EnterpriseSearchSelect = ({ value, onChange, disabled }) => {
     setState({ ...state, inputVal: val })
     triggerChange(val)
   }
-  const options = roadlist?.map(item => ({ label: item.realName, value: item.ID }))
+  const options = roadlist?.map(item => ({ label: item.mobile + ' ' + item.realName, value: item.ID }))
   return (
     <Select
       showSearch

+ 3 - 2
src/pages/Product/Road/Enterprise/components/AddEnterprise/index.jsx

@@ -58,7 +58,7 @@ const AddEnterprise = ({
       ?.validateFields()
       .then(async values => {
         try {
-          const successs = await onConfirm(values)
+          const successs = await onConfirm({ ...values, companyId: defaultValues.companyId })
           if (successs) {
             // !isNullOrUnDef(reload) && reload()
             formRef?.resetFields()
@@ -94,6 +94,7 @@ const AddEnterprise = ({
       }
       {...resetModalProps}>
       <Form {...layout} form={formRef} initialValues={defaultValues}>
+        {/* <ProFormText name="companyId" label="企业ID" hidden /> */}
         <Form.Item
           name="companyName"
           label="创建企业"
@@ -120,7 +121,7 @@ const AddEnterprise = ({
           name="adminID"
           label="管理员名称"
           hasFeedback
-          rules={[{ required: true.valueOf, message: '当前账号非大司空用户,请重新输入' }]}>
+          rules={[{ required: true, message: '当前账号非大司空用户,请重新输入' }]}>
           <EnterpriseSearchSelect disabled={disabled} />
         </Form.Item>
         {/* <Form.Item

+ 3 - 3
src/pages/Product/Road/Enterprise/components/Detail/TabList.jsx

@@ -116,10 +116,10 @@ const EnterpriseTabList = props => {
               onConfirm: handleUpdateEnterprise,
               disabled: true,
               defaultValues: {
-                companyId: company.companyId,
+                companyId: company.ID,
                 companyName: company.name,
-                adminID: company.managerName,
-                licenceNum: company.numLicenses
+                adminID: company.members?.find(item => item.role === 'admin')?.memberName,
+                licenceNum: company.licenceNum
                 // cptList: company.latestUsed.map(item => item.id)
               }
             })