fix

src/components/QueryForm/index.tsx

@@ -133,7 +133,11 @@ interface Props {
     /** 是否开启 计划名称 搜索 */
     isProjectName?: boolean
     /** 是否开启 广告ID 搜索 */
+    isProjectId1?: boolean
+    /** 是否开启 广告ID 搜索 */
     isPromotionId?: boolean
+    /** 是否开启 计划ID 搜索 */
+    isPromotionId1?: boolean
     /** 是否开启 广告名称 搜索 */
     isPromotionName?: boolean
     /** 是否开启 头条广告状态 搜索 */
@@ -218,10 +222,10 @@ const QueryForm: React.FC<Props> = (props) => {
     /**************************/
     const {
         onChange, initialValues, isSource, isAccount, isAccountId, 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, isProjectId, isProjectName, isPromotionId, isPromotionName,
+        isGameRoleName, isFirstRecharge, isSwitch, isMerchantNo, isOrderId, isMerchantOrderNo, isPayStatus, isPayWay, isProductName, isRegAgent, isAgentId, isPutAgent, isRegDay, isOs, isParentId, isProjectId, isProjectName, isPromotionId, isPromotionId1, isPromotionName,
         isSysUserName, isRechargeDate, isBGGameClassify, isGameUserId, isSysUserId, 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,
-        isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isSuperParentGameId, isGameServerName, isIp, isDeviceType, isLoginType, isServerIdUn, isSourceServerName
+        isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isSuperParentGameId, isGameServerName, isIp, isDeviceType, isLoginType, isServerIdUn, isSourceServerName, isProjectId1
     } = props
     const [form] = Form.useForm()
     const parentId = Form.useWatch('parentId', form)
@@ -579,9 +583,17 @@ const QueryForm: React.FC<Props> = (props) => {
                 <Input placeholder="广告名称" allowClear style={{ width: 140 }} />
             </Form.Item></Col>}
             {/* 广告ID */}
+            {isProjectId1 && <Col><Form.Item name='projectId'>
+                <Input placeholder="广告ID" allowClear style={{ width: 140 }} />
+            </Form.Item></Col>}
+            {/* 广告ID */}
             {isPromotionId && <Col><Form.Item name='promotionId'>
                 <Input placeholder="广告ID" allowClear style={{ width: 140 }} />
             </Form.Item></Col>}
+            {/* 计划ID */}
+            {isPromotionId1 && <Col><Form.Item name='promotionId'>
+                <Input placeholder="计划ID" allowClear style={{ width: 140 }} />
+            </Form.Item></Col>}
             {/* 广告状态 */}
             {isAdTTStatus && <Col><Form.Item name='status'>
                 <Select

src/pages/gameDataStatistics/order/index.tsx

@@ -96,6 +96,8 @@ const Order: React.FC = () => {
                 isSourceServerName
                 isPayStatus
                 isGameUserId
+                isProjectId1
+                isPromotionId1
                 isUserName
                 isPayIntervalTime={{ tips: '充值距注册时间区间（分钟）' }}
                 isAgentId

src/pages/gameDataStatistics/order/tableConfig.tsx

@@ -26,6 +26,14 @@ function columns12(onDetail: (data: any) => void): { label: string, fieldSHow?:
                     title: '第三方支付订单号', dataIndex: 'merchantOrderNo', label: '订单明细', align: 'center', width: 85, default: 4,
                     render: (a: string, b: any) => (<WidthEllipsis isCopy value={a} />)
                 },
+                {
+                    title: '计划ID', dataIndex: 'promotionId', label: '订单明细', align: 'center', width: 90,
+                    render: (a: string, b: any) => (<WidthEllipsis isCopy value={a} />)
+                },
+                {
+                    title: '广告ID', dataIndex: 'projectId', label: '订单明细', align: 'center', width: 90,
+                    render: (a: string, b: any) => (<WidthEllipsis isCopy value={a} />)
+                },
                 {
                     title: '玩家ID', dataIndex: 'gameUserId', label: '订单明细', align: 'center', width: 65, default: 5,
                     render: (a: string, b: any) => (<WidthEllipsis isCopy value={a} />)