fix

src/components/QueryForm/index.tsx

@@ -1364,7 +1364,7 @@ const QueryForm: React.FC<Props> = (props) => {
                     showSearch
                     allowClear
                     maxTagCount={1}
-                    mode="multiple"
+                    mode="tags"
                     style={{ minWidth: 98 }}
                     placeholder={'角色VIP'}
                     filterOption={(input, option) =>

src/pages/gameDataStatistics/order/tableConfig.tsx

@@ -107,43 +107,47 @@ function columns12(onDetail: (data: any) => void): { label: string, fieldSHow?:
                     render: (a: string, b: any) => (<WidthEllipsis value={PayScene[a]} />)
                 },
                 {
-                    title: '收款账户', dataIndex: 'payAccountId', label: '订单明细', align: 'center', width: 95, default: 20,
+                    title: '收款账户名', dataIndex: 'merchantName', label: '订单明细', align: 'center', width: 95, default: 20,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '原始服务器名', dataIndex: 'sourceServerName', label: '订单明细', align: 'center', width: 85, default: 21,
+                    title: '收款账户', dataIndex: 'payAccountId', label: '订单明细', align: 'center', width: 95, default: 21,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '游戏区服', dataIndex: 'serverName', label: '订单明细', align: 'center', width: 85, default: 22,
+                    title: '原始服务器名', dataIndex: 'sourceServerName', label: '订单明细', align: 'center', width: 85, default: 22,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '游戏角色', dataIndex: 'roleName', label: '订单明细', align: 'center', width: 85, default: 23,
+                    title: '游戏区服', dataIndex: 'serverName', label: '订单明细', align: 'center', width: 85, default: 23,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '角色等级', dataIndex: 'roleLevel', label: '订单明细', align: 'center', width: 50, default: 24,
+                    title: '游戏角色', dataIndex: 'roleName', label: '订单明细', align: 'center', width: 85, default: 24,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '角色VIP', dataIndex: 'roleVip', label: '订单明细', align: 'center', width: 45, default: 25,
+                    title: '角色等级', dataIndex: 'roleLevel', label: '订单明细', align: 'center', width: 50, default: 25,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '操作系统', dataIndex: 'os', label: '订单明细', align: 'center', width: 65, default: 26,
+                    title: '角色VIP', dataIndex: 'roleVip', label: '订单明细', align: 'center', width: 45, default: 26,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '是否切量', dataIndex: 'orderIsSwitch', label: '订单明细', align: 'center', width: 45, default: 27,
+                    title: '操作系统', dataIndex: 'os', label: '订单明细', align: 'center', width: 65, default: 27,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '下单时间', dataIndex: 'orderCreateTime', label: '订单明细', align: 'center', width: 135, default: 28, sorter: true,
+                    title: '是否切量', dataIndex: 'orderIsSwitch', label: '订单明细', align: 'center', width: 45, default: 28,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
-                    title: '支付时间', dataIndex: 'payTime', label: '订单明细', align: 'center', width: 135, default: 29, sorter: true,
+                    title: '下单时间', dataIndex: 'orderCreateTime', label: '订单明细', align: 'center', width: 135, default: 29, sorter: true,
+                    render: (a: string, b: any) => (<WidthEllipsis value={a} />)
+                },
+                {
+                    title: '支付时间', dataIndex: 'payTime', label: '订单明细', align: 'center', width: 135, default: 30, sorter: true,
                     render: (a: string, b: any) => (<WidthEllipsis value={a} />)
                 },
                 {
@@ -151,7 +155,7 @@ function columns12(onDetail: (data: any) => void): { label: string, fieldSHow?:
                     dataIndex: 'regUntilPay',
                     align: 'center',
                     width: 140,
-                    default: 30,
+                    default: 31,
                     render: (a: number) => {
                         if (a) {
                             function secondsToDhms(seconds: any) {
@@ -172,7 +176,7 @@ function columns12(onDetail: (data: any) => void): { label: string, fieldSHow?:
                     dataIndex: 'payUntilNow',
                     align: 'center',
                     width: 135,
-                    default: 31,
+                    default: 32,
                     render: (a: number) => {
                         if (a) {
                             function secondsToDhms(seconds: any) {
@@ -189,11 +193,11 @@ function columns12(onDetail: (data: any) => void): { label: string, fieldSHow?:
                     }
                 },
                 {
-                    title: '支付状态', dataIndex: 'orderStatus', label: '订单明细', align: 'center', width: 85, default: 32,
+                    title: '支付状态', dataIndex: 'orderStatus', label: '订单明细', align: 'center', width: 85, default: 33,
                     render: (a: string, b: any) => (<WidthEllipsis value={PayStatus[a]} />)
                 },
                 {
-                    title: '是否首充', dataIndex: 'isFirstRecharge', label: '订单明细', align: 'center', width: 45, default: 33,
+                    title: '是否首充', dataIndex: 'isFirstRecharge', label: '订单明细', align: 'center', width: 45, default: 34,
                     render: (a: any, b: any) => {
                         if (b?.day !== '总计') {
                             return a == 1 ? '是' : '否'
@@ -207,7 +211,7 @@ function columns12(onDetail: (data: any) => void): { label: string, fieldSHow?:
                     label: '订单明细', 
                     align: 'center', 
                     width: 70, 
-                    default: 34,
+                    default: 35,
                     render: (a: any, b: any) => {
                         if (b?.day !== '总计') {
                             return <a onClick={() => onDetail(b)}>订单详情</a>