wjx преди 1 година
родител
ревизия
ec6743a727
променени са 2 файла, в които са добавени 7 реда и са изтрити 3 реда
  1. 5 2
      src/components/QueryForm/index.tsx
  2. 2 1
      src/pages/gameDataStatistics/stream/recharge/index.tsx

+ 5 - 2
src/components/QueryForm/index.tsx

@@ -19,6 +19,8 @@ interface Props {
     isAccount?: boolean
     isAccount?: boolean
     /** 是否开启 广告账户ID 搜索 */
     /** 是否开启 广告账户ID 搜索 */
     isAccountId?: boolean
     isAccountId?: boolean
+    // 开启账号多选
+    isAccountIds?: boolean,
     /** 是否开启 公司ID 搜索 */
     /** 是否开启 公司ID 搜索 */
     isCompanyId?: boolean
     isCompanyId?: boolean
     /** 是否开启 CPID 搜索 */
     /** 是否开启 CPID 搜索 */
@@ -242,7 +244,7 @@ const QueryForm: React.FC<Props> = (props) => {
 
 
     /**************************/
     /**************************/
     const {
     const {
-        onChange, initialValues, isSource, isAccount, isAccountId, isCompanyId, isAgentKey, isAgentName, isCpId, isCpName, isCpOrderId, isCpStatus, isCreateDay, isDevice, isGameName, isRechargeGameName, isGameId, isGameIds, isOrderGameId, isGameRoleId,
+        onChange, initialValues, isSource, isAccount, isAccountId, isAccountIds, isCompanyId, isAgentKey, isAgentName, isCpId, isCpName, isCpOrderId, isCpStatus, isCreateDay, isDevice, isGameName, isRechargeGameName, isGameId, isGameIds, isOrderGameId, isGameRoleId,
         isGameRoleName, isFirstRecharge, isSwitch, isMerchantNo, isOrderId, isMerchantOrderNo, isPayStatus, isPayWay, isProductName, isRegAgent, isAgentId, isPutAgent, isRegDay, isOs, isParentId, isParentIds, isProjectId, isProjectName, isPromotionId, isPromotionId1, isPromotionName,
         isGameRoleName, isFirstRecharge, isSwitch, isMerchantNo, isOrderId, isMerchantOrderNo, isPayStatus, isPayWay, isProductName, isRegAgent, isAgentId, isPutAgent, isRegDay, isOs, isParentId, isParentIds, isProjectId, isProjectName, isPromotionId, isPromotionId1, isPromotionName,
         isSysUserName, isRechargeDate, isBGGameClassify, isGameUserId, isSysUserId, isSysUserIds, isUserName, isUserId, isSelectRanking, isGameType, isConsumeDay, rechargeDay, isBeginDay, isType, isAdTTStatus, isUserEnterType, isServerName, isServerId, isServerDay, isAdTXStatus,
         isSysUserName, isRechargeDate, isBGGameClassify, isGameUserId, isSysUserId, isSysUserIds, isUserName, isUserId, isSelectRanking, isGameType, isConsumeDay, rechargeDay, isBeginDay, isType, isAdTTStatus, isUserEnterType, isServerName, isServerId, isServerDay, isAdTXStatus,
         payTimeDay, placeAnOrderDay, isPayIntervalTime, isActiveTypes, isNickname, isMobile, isRegIp, isIsAuth, isIsBindMobile, isIsRecharge, isUserStatus, isCreateRole, isRoleCount, isVipLevel, isCreateRoleDay, isIsChange, isIsSendMail, isWeChatCompany, isWeChat,
         payTimeDay, placeAnOrderDay, isPayIntervalTime, isActiveTypes, isNickname, isMobile, isRegIp, isIsAuth, isIsBindMobile, isIsRecharge, isUserStatus, isCreateRole, isRoleCount, isVipLevel, isCreateRoleDay, isIsChange, isIsSendMail, isWeChatCompany, isWeChat,
@@ -574,8 +576,9 @@ const QueryForm: React.FC<Props> = (props) => {
             {isAccountId && <Col><Form.Item name='accountId'>
             {isAccountId && <Col><Form.Item name='accountId'>
                 <Select
                 <Select
                     maxTagCount={1}
                     maxTagCount={1}
+                    mode={isAccountIds ? 'multiple' : undefined}
                     showSearch
                     showSearch
-                    style={{ width: 140 }}
+                    style={{ minWidth: 140 }}
                     allowClear
                     allowClear
                     placeholder={'广告账号'}
                     placeholder={'广告账号'}
                     loading={getAccountListNew.loading || getAllOfOwnerUser.loading}
                     loading={getAccountListNew.loading || getAllOfOwnerUser.loading}

+ 2 - 1
src/pages/gameDataStatistics/stream/recharge/index.tsx

@@ -56,9 +56,10 @@ const Recharge: React.FC = () => {
                 isSource
                 isSource
                 isGameIds
                 isGameIds
                 isGameDimension
                 isGameDimension
-                isSysUserId
+                isSysUserIds
                 isAgentId
                 isAgentId
                 isAccountId
                 isAccountId
+                isAccountIds
                 isConsumeDay={{ ranges: getPresets() }}
                 isConsumeDay={{ ranges: getPresets() }}
                 isCreateDay={{}}
                 isCreateDay={{}}
             />}
             />}