wjx 1 месяц назад
Родитель
Сommit
ad51a861e9

+ 1 - 1
src/components/QueryForm/index.tsx

@@ -1010,7 +1010,7 @@ const QueryForm: React.FC<Props> = (props) => {
                 {isServerIds && <Col><Form.Item name='serverIds'>
                     <Select
                         maxTagCount={1}
-                        mode={isXjRole ? undefined : 'multiple'}
+                        mode={'multiple'}
                         showSearch
                         disabled={serverName}
                         style={{ minWidth: 140 }}

+ 5 - 3
src/pages/gsData/xjRoleGrade/index.tsx

@@ -57,10 +57,12 @@ const XjRoleGrade: React.FC = () => {
                 isGsId
                 onChange={(data: any) => {
                     console.log(data)
-                    const { superParentGameId, createRoleDay, serverIds, regPayIntervalTime, lastActiveTime, ...params } = data
+                    const { superParentGameId, createRoleDay, serverIds, regPayIntervalTime, lastActiveTime, customerServerId, operatorId, ...params } = data
                     let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                     newQueryForm.pageNum = 1
                     newQueryForm.serverId = serverIds
+                    newQueryForm.customerServiceId = customerServerId
+                    newQueryForm.operUserId = operatorId
                     if (createRoleDay && createRoleDay?.length === 2) {
                         newQueryForm['createTimeMin'] = moment(createRoleDay[0]).format('YYYY-MM-DD')
                         newQueryForm['createTimeMax'] = moment(createRoleDay[1]).format('YYYY-MM-DD')
@@ -97,10 +99,10 @@ const XjRoleGrade: React.FC = () => {
                 let { current, pageSize } = pagination
                 let newQueryForm = JSON.parse(JSON.stringify(queryForm))
                 if (sortData && sortData?.order) {
-                    newQueryForm['sortAsc'] = sortData?.order === 'ascend' ? true : false
+                    newQueryForm['sortType'] = sortData?.order === 'ascend' ? 'asc' : 'desc'
                     newQueryForm['sortFiled'] = sortData?.field
                 } else {
-                    delete newQueryForm['sortAsc']
+                    delete newQueryForm['sortType']
                     delete newQueryForm['sortFiled']
                 }
                 newQueryForm.pageNum = current || newQueryForm.pageNum

+ 2 - 2
src/pages/gsData/xjRoleGrade/tableConfig.tsx

@@ -42,7 +42,7 @@ function columns12(assignHandle: (data: any) => void): { label: string, fieldSHo
                     render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '角色创建时间', dataIndex: 'createTime', label: '基本信息', align: 'center', width: 125, default: 5,
+                    title: '角色创建时间', dataIndex: 'createTime', label: '基本信息', align: 'center', width: 125, default: 5, sorter: true,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
@@ -50,7 +50,7 @@ function columns12(assignHandle: (data: any) => void): { label: string, fieldSHo
                     render: (a: string) => <Statistic value={a || 0} />
                 },
                 {
-                    title: '等级上报时间', dataIndex: 'levelTime', label: '基本信息', align: 'center', width: 120, default: 7,
+                    title: '等级上报时间', dataIndex: 'levelTime', label: '基本信息', align: 'center', width: 120, default: 7, sorter: true,
                     render: (a: string) => (<WidthEllipsis value={a} />)
                 },
                 {