fix

src/components/QueryForm/index.tsx

@@ -279,6 +279,8 @@ interface Props {
     isLoginIpProv?: boolean
     /** 是否仙剑指定表 */
     isXjRole?: boolean
+    /** 是否 备注 查找 */
+    isRemark?: boolean
 }
 /**
  * 游戏数据系统 请求参数
@@ -293,7 +295,7 @@ const QueryForm: React.FC<Props> = (props) => {
         isSysUserName, isRechargeDate, LastRechargeDay, 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, isRoleLevel, isCreateRoleDay, isLastActiveTime, isIsChange, isIsSendMail, isWeChatCompany, isWeChat,
         isCustomerServerId, isOperatorId, isGsId, isServerIds, isRankingNum, isIsMergeServer, isIsParticipateMerge, isSuperParentGameId, isGameServerName, isIp, isDeviceType, isLoginType, isServerIdUn, isSourceServerName, isProjectId1, isDynamicCreativeId, isRemoveGame, isRemoveGameForSystem, isOrderLy, isAddCorpWechat,
-        isWakeUp, isUserPhoneStatus, isBackStatus, isGameDimension, isUserLastRegTime, isUserLastRegAgentId, isUserLastPitcherId, isRechargeAmountWithin24h, isRechargeTotalAmountWithin24h, isRegisterType, isConfiguredStatus, isIpCity, isIpProv, isLoginIpCity, isLoginIpProv, isXjRole
+        isWakeUp, isUserPhoneStatus, isBackStatus, isGameDimension, isUserLastRegTime, isUserLastRegAgentId, isUserLastPitcherId, isRechargeAmountWithin24h, isRechargeTotalAmountWithin24h, isRegisterType, isConfiguredStatus, isIpCity, isIpProv, isLoginIpCity, isLoginIpProv, isXjRole, isRemark
     } = props
     const [form] = Form.useForm()
     const parentId = Form.useWatch('parentId', form)
@@ -1578,6 +1580,11 @@ const QueryForm: React.FC<Props> = (props) => {
                 </Select>
             </Form.Item></Col>}
 
+            {/* 备注 */}
+            {isRemark && <Col><Form.Item name='remark'>
+                <Input placeholder="备注" allowClear style={{ width: 140 }} />
+            </Form.Item></Col>}
+
             {/* 角色等级 */}
             {isRoleLevel && <Col><Form.Item>
                 <Space>

src/pages/gameDataStatistics/player/list/tableConfig.tsx

@@ -24,19 +24,20 @@ function columns12(lookHandle: (data: any) => void, exportH5: (data: any) => voi
                 { title: '关联游戏名称', dataIndex: 'relationGameName', label: '玩家列表', align: 'center', width: 80, default: 11, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
                 { title: '关联用户ID', dataIndex: 'relationUserId', label: '玩家列表', align: 'center', width: 80, default: 12, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
                 { title: '关联建立时间', dataIndex: 'relationCreateTime', label: '玩家列表', align: 'center', width: 140, default: 13, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
-                { title: '绑定手机', dataIndex: 'mobile', label: '玩家列表', align: 'center', width: 90, default: 14, render: (a: string, b: any) => (<WidthEllipsis value={a || '--'} />) },
-                { title: '充值金额', dataIndex: 'rechargeMoney', label: '玩家列表', align: 'center', width: 80, default: 15, render: (a: string, b: any) => (<Statistic value={a || 0} />) },
-                { title: '充值次数', dataIndex: 'rechargeCount', label: '玩家列表', align: 'center', width: 45, default: 16, render: (a: string, b: any) => (<Statistic value={a || 0} />) },
-                { title: '创角数', dataIndex: 'roleCount', label: '玩家列表', align: 'center', width: 45, default: 17, render: (a: string, b: any) => (<Statistic value={a || 0} />) },
-                { title: '最近登录时间', dataIndex: 'updateTime', label: '玩家列表', align: 'center', width: 140, default: 18, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
-                { title: '最近充值时间', dataIndex: 'lastRechargeTime', label: '玩家列表', align: 'center', width: 140, default: 19, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '分享用户ID', dataIndex: 'shareUserId', label: '玩家列表', align: 'center', width: 80, default: 14, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '绑定手机', dataIndex: 'mobile', label: '玩家列表', align: 'center', width: 90, default: 15, render: (a: string, b: any) => (<WidthEllipsis value={a || '--'} />) },
+                { title: '充值金额', dataIndex: 'rechargeMoney', label: '玩家列表', align: 'center', width: 80, default: 16, render: (a: string, b: any) => (<Statistic value={a || 0} />) },
+                { title: '充值次数', dataIndex: 'rechargeCount', label: '玩家列表', align: 'center', width: 45, default: 17, render: (a: string, b: any) => (<Statistic value={a || 0} />) },
+                { title: '创角数', dataIndex: 'roleCount', label: '玩家列表', align: 'center', width: 45, default: 18, render: (a: string, b: any) => (<Statistic value={a || 0} />) },
+                { title: '最近登录时间', dataIndex: 'updateTime', label: '玩家列表', align: 'center', width: 140, default: 19, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '最近充值时间', dataIndex: 'lastRechargeTime', label: '玩家列表', align: 'center', width: 140, default: 20, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
                 {
                     title: '注册充值时间差',
                     dataIndex: 'regPayTimeDiff',
                     align: 'center',
                     label: '玩家列表',
                     width: 140,
-                    default: 20,
+                    default: 21,
                     render: (a: string, b: any) => {
                         function secondsToDhms(seconds: any) {
                             const days = Math.floor(seconds / (3600 * 24));
@@ -49,7 +50,7 @@ function columns12(lookHandle: (data: any) => void, exportH5: (data: any) => voi
                     }
                 },
                 {
-                    title: '玩家状态', dataIndex: 'status', label: '玩家列表', align: 'center', width: 70, default: 21,
+                    title: '玩家状态', dataIndex: 'status', label: '玩家列表', align: 'center', width: 70, default: 22,
                     render: (a: any) => {
                         return ({ '3': <Badge status="error" text="冻结" />, '2': <Badge status="success" text="正常" />, '1': <Badge status="warning" text="试玩" /> } as any)[a]
                     }
@@ -69,7 +70,7 @@ function columns12(lookHandle: (data: any) => void, exportH5: (data: any) => voi
                     align: 'center',
                     width: 155,
                     label: '操作',
-                    default: 22,
+                    default: 23,
                     render: (a: string, b: any) => {
                         return <Row justify='center' gutter={[10, 0]}>
                             {b?.gameCategoryId === 6 && <Col><a style={{ fontSize: "12px" }} onClick={() => { exportH5(b) }}><SwapOutlined /> 转端</a></Col>}

src/pages/gsData/xjRoleGrade/index.tsx

@@ -43,6 +43,7 @@ const XjRoleGrade: React.FC = () => {
             leftChild={<QueryForm
                 initialValues={{ superParentGameId: 12 }}
                 isXjRole
+                isRemark
                 isGameRoleName
                 isGameRoleId
                 isSuperParentGameId

src/pages/gsData/xjRoleGrade/tableConfig.tsx

@@ -52,7 +52,7 @@ function columns12(assignHandle: (data: any) => void): { label: string, fieldSHo
                 },
                 {
                     title: '角色创建时间', dataIndex: 'createTime', label: '基本信息', align: 'center', width: 125, default: 6, sorter: true,
-                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                    render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {
                     title: '角色等级', dataIndex: 'roleLevel', label: '基本信息', align: 'center', width: 60, sorter: true, default: 7,
@@ -103,35 +103,39 @@ function columns12(assignHandle: (data: any) => void): { label: string, fieldSHo
                     render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '角色登录IP数量', dataIndex: 'ipCount', label: '角色游戏数据', align: 'center', width: 65, sorter: true, default: 12,
+                    title: '是否导量用户', dataIndex: 'importUser', label: '角色游戏数据', align: 'center', width: 55, sorter: true, default: 12,
+                    render: (a: boolean) => a ? '是' : '否'
+                },
+                {
+                    title: '角色登录IP数量', dataIndex: 'ipCount', label: '角色游戏数据', align: 'center', width: 65, sorter: true, default: 13,
                     render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<LoginIpDetails gameId={b.gameId} roleId={b.roleId} icon={<EyeOutlined />} />} />
                 },
                 {
-                    title: '同玩家角色数量', dataIndex: 'userRoleCount', label: '角色游戏数据', align: 'center', width: 65, sorter: true, default: 13,
+                    title: '同玩家角色数量', dataIndex: 'userRoleCount', label: '角色游戏数据', align: 'center', width: 65, sorter: true, default: 14,
                     render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<LookRoleDetails userId={b.userId} icon={<EyeOutlined />} />} />
                 },
                 {
-                    title: '角色同IP的玩家数量', dataIndex: 'userCount', label: '角色游戏数据', align: 'center', width: 70, sorter: true, default: 14,
+                    title: '角色同IP的玩家数量', dataIndex: 'userCount', label: '角色游戏数据', align: 'center', width: 70, sorter: true, default: 15,
                     render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<TongIpUser roleId={b.roleId} icon={<EyeOutlined />} />} />
                 },
                 {
-                    title: '同IP的角色数量', dataIndex: 'roleCount', label: '角色游戏数据', align: 'center', width: 70, sorter: true, default: 15,
+                    title: '同IP的角色数量', dataIndex: 'roleCount', label: '角色游戏数据', align: 'center', width: 70, sorter: true, default: 16,
                     render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<RegIpRoleDetails roleId={b.roleId} excludeUserType={0} icon={<EyeOutlined />} />} />
                 },
                 {
-                    title: '同IP的角色数量（排除同玩家）', dataIndex: 'ipRoleCountFilter', label: '角色游戏数据', align: 'center', width: 90, sorter: true, default: 16,
+                    title: '同IP的角色数量（排除同玩家）', dataIndex: 'ipRoleCountFilter', label: '角色游戏数据', align: 'center', width: 90, sorter: true, default: 17,
                     render: (a: number, b: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<RegIpRoleDetails roleId={b.roleId} excludeUserType={1} icon={<EyeOutlined />} />} />
                 },
                 {
-                    title: '疑似同玩家数量', dataIndex: 'suspectedCount', label: '角色游戏数据', align: 'center', width: 80, sorter: true, default: 17,
+                    title: '疑似同玩家数量', dataIndex: 'suspectedCount', label: '角色游戏数据', align: 'center', width: 80, sorter: true, default: 18,
                     render: (a: number, record: any) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} suffix={<SuspectedUser roleId={record.roleId} icon={<EyeOutlined />} />} />
                 },
                 {
-                    title: '同玩家IP的角色数量（排除同玩家）', dataIndex: 'roleUserIpCountFilter', label: '角色游戏数据', align: 'center', width: 100, sorter: true, default: 18,
+                    title: '同玩家IP的角色数量（排除同玩家）', dataIndex: 'roleUserIpCountFilter', label: '角色游戏数据', align: 'center', width: 100, sorter: true, default: 19,
                     render: (a: number) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} />
                 },
                 {
-                    title: '角色所在玩家登录过的所有IP的统计数量', dataIndex: 'roleUserIpCount', label: '角色游戏数据', align: 'center', width: 100, sorter: true, default: 19,
+                    title: '角色所在玩家登录过的所有IP的统计数量', dataIndex: 'roleUserIpCount', label: '角色游戏数据', align: 'center', width: 100, sorter: true, default: 20,
                     render: (a: number) => <Statistic value={a || 0} valueStyle={a > 1 ? { color: 'red' } : {}} />
                 }
             ]
@@ -139,10 +143,11 @@ function columns12(assignHandle: (data: any) => void): { label: string, fieldSHo
         {
             label: '客户管理操作',
             data: [
-                { title: 'GS', dataIndex: 'gsName', label: '客户管理操作', align: 'center', width: 80, default: 20, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
-                { title: '客服', dataIndex: 'customerServiceName', label: '客户管理操作', align: 'center', width: 80, default: 21, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
-                { title: '运营', dataIndex: 'operUserName', label: '客户管理操作', align: 'center', width: 80, default: 22, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
-                { title: '投手', dataIndex: 'putUserName', label: '客户管理操作', align: 'center', width: 80, default: 23, render: (a: string, b: any) => (<WidthEllipsis value={a} />) }
+                { title: 'GS', dataIndex: 'gsName', label: '客户管理操作', align: 'center', width: 80, default: 21, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '客服', dataIndex: 'customerServiceName', label: '客户管理操作', align: 'center', width: 80, default: 22, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '运营', dataIndex: 'operUserName', label: '客户管理操作', align: 'center', width: 80, default: 23, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '投手', dataIndex: 'putUserName', label: '客户管理操作', align: 'center', width: 80, default: 24, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
+                { title: '备注', dataIndex: 'remark', label: '客户管理操作', align: 'center', width: 80, default: 25, render: (a: string, b: any) => (<WidthEllipsis value={a} />) },
             ]
         },
         {
@@ -154,7 +159,7 @@ function columns12(assignHandle: (data: any) => void): { label: string, fieldSHo
                     align: 'center',
                     width: 70,
                     label: '操作',
-                    default: 24,
+                    default: 26,
                     render: (_: any, b: any) => {
                         return <Space>
                             <LookRoleDetails userId={b.userId} />