Bladeren bron

fix: 修复客户以及单位新增中自定义表单项对ModalStore的适配性问题

lanjianrong 4 jaren geleden
bovenliggende
commit
402a801474

+ 0 - 1
src/pages/Customer/Client/components/AddClient/TelephoneFormItem.jsx

@@ -56,7 +56,6 @@ const TelephoneFormItem = ({ value, onChange, validateFn }) => {
   const { visible, list, inputVal } = state
   return (
     <Popover
-      zIndex={1003}
       placement="bottom"
       visible={list && list?.length && visible}
       onVisibleChange={e => setState({ ...state, visible: e })}

+ 0 - 1
src/pages/Customer/Company/components/AddCompany/CompanyFormItem.jsx

@@ -60,7 +60,6 @@ const CompanyFormItem = ({ value, onChange, validateFn }) => {
   const { visible, list, inputVal } = state
   return (
     <Popover
-      zIndex={1003}
       placement="bottom"
       visible={list && list.length && visible}
       onVisibleChange={e => setState({ ...state, visible: e })}

+ 3 - 4
src/pages/Customer/Company/components/AddCompany/index.jsx

@@ -58,8 +58,8 @@ const AddCompanyModal = ({
             formRef?.resetFields()
             setTimeout(() => {
               setValidStatusFcn('')
-              onCancel()
             }, 80)
+            onCancel()
           }
         } catch (error) {}
       })
@@ -89,7 +89,6 @@ const AddCompanyModal = ({
               type="primary"
               className="ml-2"
               onClick={() => {
-                setShowDataItem(true)
                 const values = {}
                 if (dataType === ChangeCompMap.CLIENT.key) {
                   values.clientId = dataId
@@ -97,7 +96,7 @@ const AddCompanyModal = ({
                 if (dataType === ChangeCompMap.BUSINESS.key) {
                   values.businessId = dataId
                 }
-                formRef && formRef.setFieldsValue(values)
+                formRef?.setFieldsValue(values)
                 handleOnOk()
               }}
             >
@@ -117,7 +116,7 @@ const AddCompanyModal = ({
         >
           <CompanyFormItem validateFn={status => setValidStatusFcn(status)} />
         </Form.Item>
-        {showDataItem ? <ProFormText name={`${dataType}Id`} hidden /> : null}
+        <ProFormText name={`${dataType}Id`} hidden />
         <Form.Item
           name="districtIds"
           label="单位地区"

+ 1 - 0
src/pages/Customer/Company/components/ConnectCompany/index.jsx

@@ -75,6 +75,7 @@ const ConnectCompany = ({
         initData()
       }
     }
+    return code === consts.RET_CODE.SUCCESS
   }
 
   // 客户/商机关联单位

+ 1 - 1
src/pages/Customer/Company/index.jsx

@@ -177,7 +177,7 @@ const Company = props => {
       key: 'phone',
       search: false,
       sorter: true,
-      width: 100
+      width: 110
     },
     {
       title: '个人标签',