Merge branch 'fix2' into 'v2'

fix: 修复物流公司管理编辑提交时 roleId为undefind问题 See merge request linkseeks-design/pro-platform!586 (cherry picked from commit c436eadd57df803e6e59f4c03e951b8abf55016d) 42ffedb9 fix: 修复物流公司管理编辑提交时 roleId为undefind问题

Merge branch 'fix2' into 'v2'
2e0b7f42 · 前端-许冠华 · 2820df7d · 2e0b7f42
Commit 2e0b7f42 authored Apr 29, 2022 by 前端-许冠华
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

add.tsx ...bility/logisticsAdminister/logisticsCompanyManage/add.tsx +4 -3

No files found.
--- a/src/pages/transaction/logisticsAbility/logisticsAdminister/logisticsCompanyManage/add.tsx
+++ b/src/pages/transaction/logisticsAbility/logisticsAdminister/logisticsCompanyManage/add.tsx
@@ -123,7 +123,7 @@ const LogisticsCompanyManageAdded = (props: any) => {
    }
    if (values.cooperateType === COOPERATE.PLATFORM) {
      params.companyMemberId = values.companyMemberId;
-      params.companyRoleId = excludeList[0].roleId;
+      params.companyRoleId = values.companyRoleId || excludeList[0].roleId;
    } else {
      params.code = values.code
    }
@@ -199,16 +199,17 @@ const LogisticsCompanyManageAdded = (props: any) => {
      >
        <Card>
          <NiceForm
+            previewPlaceholder='-'
            initialValues={formatedValue}
            actions={formActions}
            onSubmit={handleOnSubmit}
            expressionScope={{
-              connectMember: (
+              connectMember: path !== 'preview' ? (
                <div onClick={() => toggle(true)}>
                  <LinkOutlined style={{ marginRight: 4 }} />
                  {intl.formatMessage({ id: 'logistics.xuanze' })}
                </div>
-              )
+              ) : null
            }}
            effects={() => {
              useFormEffects();