Merge branch 'dev' of gitea.51mars.com:Oak-Team/oak-pay-business into dev

es/aspects/withdraw.d.ts

@@ -3,7 +3,7 @@ export declare function getWithdrawCreateData(params: {
     accountId: string;
     price: number;
     withdrawAccountId?: string;
-}, context: BRC): Promise<(Partial<Omit<import("../oak-app-domain/Withdraw/Schema").OpSchema, "creatorId" | "accountId">> & {
+}, context: BRC): Promise<(Partial<Omit<import("../oak-app-domain/Withdraw/Schema").OpSchema, "accountId" | "creatorId">> & {
     id: string;
 } & {
     accountId: string;
@@ -12,12 +12,12 @@ export declare function getWithdrawCreateData(params: {
     creatorId: string;
     creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined;
 } & {
-    refund$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdrawId" | "withdraw">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdrawId" | "withdraw">>)[] | undefined;
-    withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdrawId" | "withdraw">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdrawId" | "withdraw">>)[] | undefined;
+    refund$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdraw" | "withdrawId">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdraw" | "withdrawId">>)[] | undefined;
+    withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdraw" | "withdrawId">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdraw" | "withdrawId">>)[] | undefined;
     modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/ModiEntity/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/ModiEntity/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
     operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/OperEntity/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/OperEntity/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
     accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/AccountOper/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/AccountOper/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
-}) | (Partial<Omit<import("../oak-app-domain/Withdraw/Schema").OpSchema, "creatorId" | "accountId">> & {
+}) | (Partial<Omit<import("../oak-app-domain/Withdraw/Schema").OpSchema, "accountId" | "creatorId">> & {
     id: string;
 } & {
     accountId: string;
@@ -26,12 +26,12 @@ export declare function getWithdrawCreateData(params: {
     creator?: undefined;
     creatorId: string;
 } & {
-    refund$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdrawId" | "withdraw">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdrawId" | "withdraw">>)[] | undefined;
-    withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdrawId" | "withdraw">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdrawId" | "withdraw">>)[] | undefined;
+    refund$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdraw" | "withdrawId">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdraw" | "withdrawId">>)[] | undefined;
+    withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdraw" | "withdrawId">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdraw" | "withdrawId">>)[] | undefined;
     modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/ModiEntity/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/ModiEntity/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
     operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/OperEntity/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/OperEntity/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
     accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/AccountOper/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/AccountOper/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
-}) | (Partial<Omit<import("../oak-app-domain/Withdraw/Schema").OpSchema, "creatorId" | "accountId">> & {
+}) | (Partial<Omit<import("../oak-app-domain/Withdraw/Schema").OpSchema, "accountId" | "creatorId">> & {
     id: string;
 } & {
     account?: undefined;
@@ -40,12 +40,12 @@ export declare function getWithdrawCreateData(params: {
     creatorId: string;
     creator?: import("../oak-app-domain/User/Schema").UpdateOperation | undefined;
 } & {
-    refund$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdrawId" | "withdraw">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdrawId" | "withdraw">>)[] | undefined;
-    withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdrawId" | "withdraw">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdrawId" | "withdraw">>)[] | undefined;
+    refund$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdraw" | "withdrawId">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdraw" | "withdrawId">>)[] | undefined;
+    withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdraw" | "withdrawId">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdraw" | "withdrawId">>)[] | undefined;
     modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/ModiEntity/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/ModiEntity/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
     operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/OperEntity/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/OperEntity/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
     accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/AccountOper/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/AccountOper/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
-}) | (Partial<Omit<import("../oak-app-domain/Withdraw/Schema").OpSchema, "creatorId" | "accountId">> & {
+}) | (Partial<Omit<import("../oak-app-domain/Withdraw/Schema").OpSchema, "accountId" | "creatorId">> & {
     id: string;
 } & {
     account?: undefined;
@@ -54,8 +54,8 @@ export declare function getWithdrawCreateData(params: {
     creator?: undefined;
     creatorId: string;
 } & {
-    refund$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdrawId" | "withdraw">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdrawId" | "withdraw">>)[] | undefined;
-    withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdrawId" | "withdraw">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdrawId" | "withdraw">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdrawId" | "withdraw">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdrawId" | "withdraw">>)[] | undefined;
+    refund$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdraw" | "withdrawId">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/Refund/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/Refund/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/Refund/Schema").CreateOperationData, "withdraw" | "withdrawId">>)[] | undefined;
+    withdrawTransfer$withdraw?: import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdraw" | "withdrawId">[]> | (import("oak-domain/lib/types").Operation<string, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").UpdateOperationData, "withdraw" | "withdrawId">, Omit<import("../oak-app-domain/WithdrawTransfer/Schema").Filter, "withdraw" | "withdrawId">> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/WithdrawTransfer/Schema").CreateOperationData, "withdraw" | "withdrawId">>)[] | undefined;
     modiEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/ModiEntity/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/ModiEntity/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
     operEntity$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/OperEntity/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/OperEntity/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;
     accountOper$entity?: import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/AccountOper/Schema").CreateOperationData, "entity" | "entityId">[]> | import("oak-domain/lib/types").Operation<"create", Omit<import("../oak-app-domain/AccountOper/Schema").CreateOperationData, "entity" | "entityId">>[] | undefined;

es/components/sysAccount/survey/web.pc.module.less

@@ -19,13 +19,14 @@
         padding: 8px;
         flex-wrap: wrap;
         margin-top: 12px;
+        gap: 14px;
 
         .sysAccount {
             width: 244px;
             height: 284px;
             border: solid 0.1px silver;
             border-radius: 5px;
-            margin-right: 14px;
+            // margin-right: 14px;
             display: flex;
             flex-direction: column;
             align-items: stretch;
@@ -64,7 +65,7 @@
             }
         }
     }
-    
+
     .span2 {
         display: flex;
         flex-direction: row;

es/components/sysAccountOper/list/web.pc.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../oak-app-domain';
-import { SysAccountOperType } from '../../../oak-app-domain/SysAccountOper/Schema';
+import { SysAccountOperType } from '../../../types/sysAccountOper';
 type SAOType = SysAccountOperType | 'all';
 export default function Render(props: WebComponentProps<EntityDict, 'accountOper', true, {
     sysAccountOpers?: Array<{

es/components/sysAccountOper/list/web.pc.js

@@ -6,7 +6,6 @@ export default function Render(props) {
     const { sysAccountOpers, month, type, monthStr, oakLoading, oakLoadingMore, typesOptions, oakPagination } = props.data;
     const { t, setType, setMonth, setPageSize, setCurrentPage } = props.methods;
     const { pageSize, total, currentPage } = oakPagination || {};
-    console.log(oakPagination);
     return (<div className={Styles.container}>
             <Flex gap="middle" justify="flex-end" className={Styles.control}>
                 <DatePicker picker="month" onChange={(value) => {

es/configuration/attrUpdateMatrix.js

@@ -138,7 +138,7 @@ const attrUpdateMatrix = {
             actions: ['update'],
         },
         price: {
-            actions: ['pay', 'refund', 'deposit', 'withdraw', 'tax'],
+            actions: ['pay', 'refund', 'deposit', 'withdrawTransfer', 'tax', 'moveOut', 'moveIn', 'compensate'],
         },
         allowDeposit: {
             actions: ['update'],
@@ -200,7 +200,7 @@ const attrUpdateMatrix = {
             actions: ['update'],
         },
         price: {
-            actions: ['pay', 'refund', 'deposit', 'withdraw', 'tax'],
+            actions: ['pay', 'refund', 'deposit', 'withdrawTransfer', 'tax', 'moveOut', 'moveIn', 'compensate'],
         }
     },
     withdrawAccount: {

es/entities/OfflineAccount.d.ts

@@ -5,6 +5,7 @@ import { Schema as Pay } from './Pay';
 import { Schema as SysAccountOper } from './SysAccountOper';
 import { Schema as AbstractAccount } from './AbstractAccount';
 import { Schema as WithdrawChannel } from './WithdrawChannel';
+import { SysAccountOperType as sysAction } from '../types/sysAccountOper';
 export interface Schema extends AbstractAccount {
     type: 'bank' | 'alipay' | 'wechat' | 'shouqianba' | 'others';
     channel?: String<32>;
@@ -19,7 +20,7 @@ export interface Schema extends AbstractAccount {
     channels: WithdrawChannel[];
     enabled: Boolean;
 }
-export type Action = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax';
+export type Action = sysAction | 'deposit' | 'tax';
 export declare const entityDesc: EntityDesc<Schema, Action, '', {
     type: Schema['type'];
 }>;

es/entities/OfflineAccount.js

@@ -34,8 +34,11 @@ export const entityDesc = {
             action: {
                 pay: '支付',
                 refund: '退款',
+                withdrawTransfer: '提现转账',
+                compensate: '补偿',
+                moveIn: '转入',
+                moveOut: '转出',
                 deposit: '充值',
-                withdraw: '提现',
                 tax: '渠道费',
             }
         },
@@ -53,8 +56,11 @@ export const entityDesc = {
         icon: {
             pay: '',
             refund: '',
+            withdrawTransfer: '',
+            compensate: '',
+            moveIn: '',
+            moveOut: '',
             deposit: '',
-            withdraw: '',
             tax: '',
         }
     },

es/entities/SysAccountOper.d.ts

@@ -5,7 +5,7 @@ import { Schema as Pay } from './Pay';
 import { Schema as Refund } from './Refund';
 import { Schema as WithdrawTransfer } from './WithdrawTransfer';
 import { Schema as SysAccountMove } from './SysAccountMove';
-export type SysAccountOperType = 'pay' | 'refund' | 'withdrawTransfer' | 'compensate' | 'moveIn' | 'moveOut';
+import { SysAccountOperType } from '../types/sysAccountOper';
 export interface Schema extends EntityShape {
     delta: Price;
     type: SysAccountOperType;

es/entities/SysAccountOper.js

@@ -11,7 +11,7 @@ export const entityDesc = {
                 pay: '关联支付',
                 refund: '关联退款',
                 withdrawTransfer: '关联转账提现',
-                sysAccountMove: '系统资金移动'
+                sysAccountMove: '系统资金移动',
             },
             v: {
                 type: {

es/entities/WpAccount.d.ts

@@ -5,6 +5,7 @@ import { Schema as System } from './System';
 import { Schema as SysAccountOper } from './SysAccountOper';
 import { Schema as AbstractAccount } from './AbstractAccount';
 import { Schema as WithdrawChannel } from './WithdrawChannel';
+import { SysAccountOperType as sysAction } from '../types/sysAccountOper';
 export interface Schema extends AbstractAccount {
     wechatPay: WechatPay;
     mchId: String<128>;
@@ -17,5 +18,5 @@ export interface Schema extends AbstractAccount {
     channels: WithdrawChannel[];
     enabled: Boolean;
 }
-export type Action = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax';
+export type Action = sysAction | 'deposit' | 'tax';
 export declare const entityDesc: EntityDesc<Schema, Action>;

es/entities/WpAccount.js

@@ -23,8 +23,11 @@ export const entityDesc = {
             action: {
                 pay: '支付',
                 refund: '退款',
+                withdrawTransfer: '提现转账',
+                compensate: '补偿',
+                moveIn: '转入',
+                moveOut: '转出',
                 deposit: '充值',
-                withdraw: '提现',
                 tax: '渠道费',
             }
         },
@@ -33,8 +36,11 @@ export const entityDesc = {
         icon: {
             pay: '',
             refund: '',
+            withdrawTransfer: '',
+            compensate: '',
+            moveIn: '',
+            moveOut: '',
             deposit: '',
-            withdraw: '',
             tax: '',
         }
     }

es/oak-app-domain/OfflineAccount/Action.d.ts

@@ -1,5 +1,6 @@
+import { SysAccountOperType as sysAction } from "../../types/sysAccountOper";
 import { GenericAction } from "oak-domain/lib/actions/action";
-export type ParticularAction = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax';
+export type ParticularAction = sysAction | 'deposit' | 'tax';
 export declare const actions: string[];
 export type Action = GenericAction | ParticularAction | string;
 export declare const actionDefDict: {};

es/oak-app-domain/OfflineAccount/Action.js

@@ -1,2 +1,2 @@
-export const actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "pay", "refund", "deposit", "withdraw", "tax"];
+export const actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "pay", "refund", "withdrawTransfer", "compensate", "moveIn", "moveOut", "deposit", "tax"];
 export const actionDefDict = {};

es/oak-app-domain/OfflineAccount/Style.js

@@ -11,8 +11,11 @@ export const style = {
     icon: {
         pay: '',
         refund: '',
+        withdrawTransfer: '',
+        compensate: '',
+        moveIn: '',
+        moveOut: '',
         deposit: '',
-        withdraw: '',
         tax: '',
     }
 };

es/oak-app-domain/OfflineAccount/locales/zh_CN.json

@@ -1 +1 @@
-{ "name": "线下账户", "attr": { "type": "类型", "channel": "通道", "name": "用户/帐号", "qrCode": "收款二维码", "taxLossRatio": "商户号手续费（百分比）", "refundCompensateRatio": "退款补偿百分比", "refundGapDays": "（支付后）允许退款的天数", "allowWithdrawTransfer": "允许提现转账", "withdrawTransferLossRatio": "提现转账费率（百分数）", "allowDeposit": "允许主动充值", "allowPay": "允许主动支付", "system": "所属系统", "price": "余额", "pays": "支付", "opers": "操作记录", "channels": "提现通道", "enabled": "是否启用" }, "v": { "type": { "bank": "银行", "alipay": "支付宝", "wechat": "微信", "shouqianba": "收钱吧", "others": "其它" } }, "action": { "pay": "支付", "refund": "退款", "deposit": "充值", "withdraw": "提现", "tax": "渠道费" } }
+{ "name": "线下账户", "attr": { "type": "类型", "channel": "通道", "name": "用户/帐号", "qrCode": "收款二维码", "taxLossRatio": "商户号手续费（百分比）", "refundCompensateRatio": "退款补偿百分比", "refundGapDays": "（支付后）允许退款的天数", "allowWithdrawTransfer": "允许提现转账", "withdrawTransferLossRatio": "提现转账费率（百分数）", "allowDeposit": "允许主动充值", "allowPay": "允许主动支付", "system": "所属系统", "price": "余额", "pays": "支付", "opers": "操作记录", "channels": "提现通道", "enabled": "是否启用" }, "v": { "type": { "bank": "银行", "alipay": "支付宝", "wechat": "微信", "shouqianba": "收钱吧", "others": "其它" } }, "action": { "pay": "支付", "refund": "退款", "withdrawTransfer": "提现转账", "compensate": "补偿", "moveIn": "转入", "moveOut": "转出", "deposit": "充值", "tax": "渠道费" } }

es/oak-app-domain/SysAccountOper/Schema.d.ts

@@ -4,13 +4,13 @@ import { OneOf } from "oak-domain/lib/types/Polyfill";
 import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity";
 import { AppendOnlyAction } from "oak-domain/lib/actions/action";
 import { Price, String } from "oak-domain/lib/types/DataType";
+import { SysAccountOperType } from "../../types/sysAccountOper";
 import * as Pay from "../Pay/Schema";
 import * as Refund from "../Refund/Schema";
 import * as WithdrawTransfer from "../WithdrawTransfer/Schema";
 import * as SysAccountMove from "../SysAccountMove/Schema";
 import * as OfflineAccount from "../OfflineAccount/Schema";
 import * as WpAccount from "../WpAccount/Schema";
-export type SysAccountOperType = "pay" | "refund" | "withdrawTransfer" | "compensate" | "moveIn" | "moveOut";
 export type OpSchema = EntityShape & {
     delta: Price;
     type: SysAccountOperType;

es/oak-app-domain/WpAccount/Action.d.ts

@@ -1,5 +1,6 @@
+import { SysAccountOperType as sysAction } from "../../types/sysAccountOper";
 import { GenericAction } from "oak-domain/lib/actions/action";
-export type ParticularAction = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax';
+export type ParticularAction = sysAction | 'deposit' | 'tax';
 export declare const actions: string[];
 export type Action = GenericAction | ParticularAction | string;
 export declare const actionDefDict: {};

es/oak-app-domain/WpAccount/Action.js

@@ -1,2 +1,2 @@
-export const actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "pay", "refund", "deposit", "withdraw", "tax"];
+export const actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "pay", "refund", "withdrawTransfer", "compensate", "moveIn", "moveOut", "deposit", "tax"];
 export const actionDefDict = {};

es/oak-app-domain/WpAccount/Style.js

@@ -2,8 +2,11 @@ export const style = {
     icon: {
         pay: '',
         refund: '',
+        withdrawTransfer: '',
+        compensate: '',
+        moveIn: '',
+        moveOut: '',
         deposit: '',
-        withdraw: '',
         tax: '',
     }
 };

es/oak-app-domain/WpAccount/locales/zh_CN.json

@@ -1 +1 @@
-{ "name": "微信支付帐号", "attr": { "wechatPay": "微信支付", "taxLossRatio": "商户号手续费（百分比）", "refundCompensateRatio": "退款补偿百分比", "refundGapDays": "（支付后）允许退款的天数", "allowWithdrawTransfer": "允许提现转账", "withdrawTransferLossRatio": "提现转账费率（百分数）", "mchId": "商户号", "publicKeyFilePath": "公钥文件路径", "privateKeyFilePath": "私钥文件路径", "apiV3Key": "apiV3Key", "price": "余额", "system": "关联系统", "opers": "操作记录", "channels": "提现通道", "enabled": "是否启用" }, "action": { "pay": "支付", "refund": "退款", "deposit": "充值", "withdraw": "提现", "tax": "渠道费" } }
+{ "name": "微信支付帐号", "attr": { "wechatPay": "微信支付", "taxLossRatio": "商户号手续费（百分比）", "refundCompensateRatio": "退款补偿百分比", "refundGapDays": "（支付后）允许退款的天数", "allowWithdrawTransfer": "允许提现转账", "withdrawTransferLossRatio": "提现转账费率（百分数）", "mchId": "商户号", "publicKeyFilePath": "公钥文件路径", "privateKeyFilePath": "私钥文件路径", "apiV3Key": "apiV3Key", "price": "余额", "system": "关联系统", "opers": "操作记录", "channels": "提现通道", "enabled": "是否启用" }, "action": { "pay": "支付", "refund": "退款", "withdrawTransfer": "提现转账", "compensate": "补偿", "moveIn": "转入", "moveOut": "转出", "deposit": "充值", "tax": "渠道费" } }

es/types/sysAccountOper.d.ts

@@ -0,0 +1 @@
+export type SysAccountOperType = 'pay' | 'refund' | 'withdrawTransfer' | 'compensate' | 'moveIn' | 'moveOut';

es/types/sysAccountOper.js

@@ -0,0 +1 @@
+export {};

lib/configuration/attrUpdateMatrix.js

@@ -140,7 +140,7 @@ const attrUpdateMatrix = {
             actions: ['update'],
         },
         price: {
-            actions: ['pay', 'refund', 'deposit', 'withdraw', 'tax'],
+            actions: ['pay', 'refund', 'deposit', 'withdrawTransfer', 'tax', 'moveOut', 'moveIn', 'compensate'],
         },
         allowDeposit: {
             actions: ['update'],
@@ -202,7 +202,7 @@ const attrUpdateMatrix = {
             actions: ['update'],
         },
         price: {
-            actions: ['pay', 'refund', 'deposit', 'withdraw', 'tax'],
+            actions: ['pay', 'refund', 'deposit', 'withdrawTransfer', 'tax', 'moveOut', 'moveIn', 'compensate'],
         }
     },
     withdrawAccount: {

lib/entities/OfflineAccount.d.ts

@@ -5,6 +5,7 @@ import { Schema as Pay } from './Pay';
 import { Schema as SysAccountOper } from './SysAccountOper';
 import { Schema as AbstractAccount } from './AbstractAccount';
 import { Schema as WithdrawChannel } from './WithdrawChannel';
+import { SysAccountOperType as sysAction } from '../types/sysAccountOper';
 export interface Schema extends AbstractAccount {
     type: 'bank' | 'alipay' | 'wechat' | 'shouqianba' | 'others';
     channel?: String<32>;
@@ -19,7 +20,7 @@ export interface Schema extends AbstractAccount {
     channels: WithdrawChannel[];
     enabled: Boolean;
 }
-export type Action = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax';
+export type Action = sysAction | 'deposit' | 'tax';
 export declare const entityDesc: EntityDesc<Schema, Action, '', {
     type: Schema['type'];
 }>;

lib/entities/OfflineAccount.js

@@ -37,8 +37,11 @@ exports.entityDesc = {
             action: {
                 pay: '支付',
                 refund: '退款',
+                withdrawTransfer: '提现转账',
+                compensate: '补偿',
+                moveIn: '转入',
+                moveOut: '转出',
                 deposit: '充值',
-                withdraw: '提现',
                 tax: '渠道费',
             }
         },
@@ -56,8 +59,11 @@ exports.entityDesc = {
         icon: {
             pay: '',
             refund: '',
+            withdrawTransfer: '',
+            compensate: '',
+            moveIn: '',
+            moveOut: '',
             deposit: '',
-            withdraw: '',
             tax: '',
         }
     },

lib/entities/SysAccountOper.d.ts

@@ -5,7 +5,7 @@ import { Schema as Pay } from './Pay';
 import { Schema as Refund } from './Refund';
 import { Schema as WithdrawTransfer } from './WithdrawTransfer';
 import { Schema as SysAccountMove } from './SysAccountMove';
-export type SysAccountOperType = 'pay' | 'refund' | 'withdrawTransfer' | 'compensate' | 'moveIn' | 'moveOut';
+import { SysAccountOperType } from '../types/sysAccountOper';
 export interface Schema extends EntityShape {
     delta: Price;
     type: SysAccountOperType;

lib/entities/SysAccountOper.js

@@ -14,7 +14,7 @@ exports.entityDesc = {
                 pay: '关联支付',
                 refund: '关联退款',
                 withdrawTransfer: '关联转账提现',
-                sysAccountMove: '系统资金移动'
+                sysAccountMove: '系统资金移动',
             },
             v: {
                 type: {

lib/entities/WpAccount.d.ts

@@ -5,6 +5,7 @@ import { Schema as System } from './System';
 import { Schema as SysAccountOper } from './SysAccountOper';
 import { Schema as AbstractAccount } from './AbstractAccount';
 import { Schema as WithdrawChannel } from './WithdrawChannel';
+import { SysAccountOperType as sysAction } from '../types/sysAccountOper';
 export interface Schema extends AbstractAccount {
     wechatPay: WechatPay;
     mchId: String<128>;
@@ -17,5 +18,5 @@ export interface Schema extends AbstractAccount {
     channels: WithdrawChannel[];
     enabled: Boolean;
 }
-export type Action = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax';
+export type Action = sysAction | 'deposit' | 'tax';
 export declare const entityDesc: EntityDesc<Schema, Action>;

lib/entities/WpAccount.js

@@ -26,8 +26,11 @@ exports.entityDesc = {
             action: {
                 pay: '支付',
                 refund: '退款',
+                withdrawTransfer: '提现转账',
+                compensate: '补偿',
+                moveIn: '转入',
+                moveOut: '转出',
                 deposit: '充值',
-                withdraw: '提现',
                 tax: '渠道费',
             }
         },
@@ -36,8 +39,11 @@ exports.entityDesc = {
         icon: {
             pay: '',
             refund: '',
+            withdrawTransfer: '',
+            compensate: '',
+            moveIn: '',
+            moveOut: '',
             deposit: '',
-            withdraw: '',
             tax: '',
         }
     }

lib/oak-app-domain/OfflineAccount/Action.d.ts

@@ -1,5 +1,6 @@
+import { SysAccountOperType as sysAction } from "../../types/sysAccountOper";
 import { GenericAction } from "oak-domain/lib/actions/action";
-export type ParticularAction = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax';
+export type ParticularAction = sysAction | 'deposit' | 'tax';
 export declare const actions: string[];
 export type Action = GenericAction | ParticularAction | string;
 export declare const actionDefDict: {};

lib/oak-app-domain/OfflineAccount/Action.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.actionDefDict = exports.actions = void 0;
-exports.actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "pay", "refund", "deposit", "withdraw", "tax"];
+exports.actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "pay", "refund", "withdrawTransfer", "compensate", "moveIn", "moveOut", "deposit", "tax"];
 exports.actionDefDict = {};

lib/oak-app-domain/OfflineAccount/Style.js

@@ -14,8 +14,11 @@ exports.style = {
     icon: {
         pay: '',
         refund: '',
+        withdrawTransfer: '',
+        compensate: '',
+        moveIn: '',
+        moveOut: '',
         deposit: '',
-        withdraw: '',
         tax: '',
     }
 };

lib/oak-app-domain/OfflineAccount/locales/zh_CN.json

@@ -1 +1 @@
-{ "name": "线下账户", "attr": { "type": "类型", "channel": "通道", "name": "用户/帐号", "qrCode": "收款二维码", "taxLossRatio": "商户号手续费（百分比）", "refundCompensateRatio": "退款补偿百分比", "refundGapDays": "（支付后）允许退款的天数", "allowWithdrawTransfer": "允许提现转账", "withdrawTransferLossRatio": "提现转账费率（百分数）", "allowDeposit": "允许主动充值", "allowPay": "允许主动支付", "system": "所属系统", "price": "余额", "pays": "支付", "opers": "操作记录", "channels": "提现通道", "enabled": "是否启用" }, "v": { "type": { "bank": "银行", "alipay": "支付宝", "wechat": "微信", "shouqianba": "收钱吧", "others": "其它" } }, "action": { "pay": "支付", "refund": "退款", "deposit": "充值", "withdraw": "提现", "tax": "渠道费" } }
+{ "name": "线下账户", "attr": { "type": "类型", "channel": "通道", "name": "用户/帐号", "qrCode": "收款二维码", "taxLossRatio": "商户号手续费（百分比）", "refundCompensateRatio": "退款补偿百分比", "refundGapDays": "（支付后）允许退款的天数", "allowWithdrawTransfer": "允许提现转账", "withdrawTransferLossRatio": "提现转账费率（百分数）", "allowDeposit": "允许主动充值", "allowPay": "允许主动支付", "system": "所属系统", "price": "余额", "pays": "支付", "opers": "操作记录", "channels": "提现通道", "enabled": "是否启用" }, "v": { "type": { "bank": "银行", "alipay": "支付宝", "wechat": "微信", "shouqianba": "收钱吧", "others": "其它" } }, "action": { "pay": "支付", "refund": "退款", "withdrawTransfer": "提现转账", "compensate": "补偿", "moveIn": "转入", "moveOut": "转出", "deposit": "充值", "tax": "渠道费" } }

lib/oak-app-domain/SysAccountOper/Schema.d.ts

@@ -4,13 +4,13 @@ import { OneOf } from "oak-domain/lib/types/Polyfill";
 import { FormCreateData, FormUpdateData, DeduceAggregation, Operation as OakOperation, Selection as OakSelection, MakeAction as OakMakeAction, EntityShape } from "oak-domain/lib/types/Entity";
 import { AppendOnlyAction } from "oak-domain/lib/actions/action";
 import { Price, String } from "oak-domain/lib/types/DataType";
+import { SysAccountOperType } from "../../types/sysAccountOper";
 import * as Pay from "../Pay/Schema";
 import * as Refund from "../Refund/Schema";
 import * as WithdrawTransfer from "../WithdrawTransfer/Schema";
 import * as SysAccountMove from "../SysAccountMove/Schema";
 import * as OfflineAccount from "../OfflineAccount/Schema";
 import * as WpAccount from "../WpAccount/Schema";
-export type SysAccountOperType = "pay" | "refund" | "withdrawTransfer" | "compensate" | "moveIn" | "moveOut";
 export type OpSchema = EntityShape & {
     delta: Price;
     type: SysAccountOperType;

lib/oak-app-domain/WpAccount/Action.d.ts

@@ -1,5 +1,6 @@
+import { SysAccountOperType as sysAction } from "../../types/sysAccountOper";
 import { GenericAction } from "oak-domain/lib/actions/action";
-export type ParticularAction = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax';
+export type ParticularAction = sysAction | 'deposit' | 'tax';
 export declare const actions: string[];
 export type Action = GenericAction | ParticularAction | string;
 export declare const actionDefDict: {};

lib/oak-app-domain/WpAccount/Action.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.actionDefDict = exports.actions = void 0;
-exports.actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "pay", "refund", "deposit", "withdraw", "tax"];
+exports.actions = ["count", "stat", "download", "select", "aggregate", "create", "remove", "update", "pay", "refund", "withdrawTransfer", "compensate", "moveIn", "moveOut", "deposit", "tax"];
 exports.actionDefDict = {};

lib/oak-app-domain/WpAccount/Style.js

@@ -5,8 +5,11 @@ exports.style = {
     icon: {
         pay: '',
         refund: '',
+        withdrawTransfer: '',
+        compensate: '',
+        moveIn: '',
+        moveOut: '',
         deposit: '',
-        withdraw: '',
         tax: '',
     }
 };

lib/oak-app-domain/WpAccount/locales/zh_CN.json

@@ -1 +1 @@
-{ "name": "微信支付帐号", "attr": { "wechatPay": "微信支付", "taxLossRatio": "商户号手续费（百分比）", "refundCompensateRatio": "退款补偿百分比", "refundGapDays": "（支付后）允许退款的天数", "allowWithdrawTransfer": "允许提现转账", "withdrawTransferLossRatio": "提现转账费率（百分数）", "mchId": "商户号", "publicKeyFilePath": "公钥文件路径", "privateKeyFilePath": "私钥文件路径", "apiV3Key": "apiV3Key", "price": "余额", "system": "关联系统", "opers": "操作记录", "channels": "提现通道", "enabled": "是否启用" }, "action": { "pay": "支付", "refund": "退款", "deposit": "充值", "withdraw": "提现", "tax": "渠道费" } }
+{ "name": "微信支付帐号", "attr": { "wechatPay": "微信支付", "taxLossRatio": "商户号手续费（百分比）", "refundCompensateRatio": "退款补偿百分比", "refundGapDays": "（支付后）允许退款的天数", "allowWithdrawTransfer": "允许提现转账", "withdrawTransferLossRatio": "提现转账费率（百分数）", "mchId": "商户号", "publicKeyFilePath": "公钥文件路径", "privateKeyFilePath": "私钥文件路径", "apiV3Key": "apiV3Key", "price": "余额", "system": "关联系统", "opers": "操作记录", "channels": "提现通道", "enabled": "是否启用" }, "action": { "pay": "支付", "refund": "退款", "withdrawTransfer": "提现转账", "compensate": "补偿", "moveIn": "转入", "moveOut": "转出", "deposit": "充值", "tax": "渠道费" } }

lib/types/sysAccountOper.d.ts

@@ -0,0 +1 @@
+export type SysAccountOperType = 'pay' | 'refund' | 'withdrawTransfer' | 'compensate' | 'moveIn' | 'moveOut';

lib/types/sysAccountOper.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

src/components/sysAccount/survey/web.pc.module.less

@@ -19,13 +19,14 @@
         padding: 8px;
         flex-wrap: wrap;
         margin-top: 12px;
+        gap: 14px;
 
         .sysAccount {
             width: 244px;
             height: 284px;
             border: solid 0.1px silver;
             border-radius: 5px;
-            margin-right: 14px;
+            // margin-right: 14px;
             display: flex;
             flex-direction: column;
             align-items: stretch;
@@ -64,7 +65,7 @@
             }
         }
     }
-    
+
     .span2 {
         display: flex;
         flex-direction: row;

src/components/sysAccountOper/list/index.ts

@@ -1,4 +1,4 @@
-import { SysAccountOperType } from '@project/oak-app-domain/SysAccountOper/Schema';
+import { SysAccountOperType } from '@project/types/sysAccountOper';
 import dayjs from 'dayjs';
 import { ToYuan, ThousandCont } from "oak-domain/lib/utils/money";
 

src/components/sysAccountOper/list/web.pc.tsx

@@ -5,7 +5,7 @@ import { RowWithActions, WebComponentProps } from 'oak-frontend-base';
 import { EntityDict } from '../../../oak-app-domain';
 import Styles from './web.module.less';
 import dayJs from 'dayjs';
-import { SysAccountOperType } from '@project/oak-app-domain/SysAccountOper/Schema';
+import { SysAccountOperType } from '@project/types/sysAccountOper';
 
 type SAOType = SysAccountOperType | 'all';
 
@@ -31,7 +31,6 @@ export default function Render(props: WebComponentProps<EntityDict, 'accountOper
     const { sysAccountOpers, month, type, monthStr, oakLoading, oakLoadingMore, typesOptions, oakPagination } = props.data;
     const { t, setType, setMonth, setPageSize, setCurrentPage } = props.methods;
     const { pageSize, total, currentPage } = oakPagination || {};
-    console.log(oakPagination);
     return (
         <div className={Styles.container}>
             <Flex

src/configuration/attrUpdateMatrix.ts

@@ -143,7 +143,7 @@ const attrUpdateMatrix: AttrUpdateMatrix<EntityDict> = {
             actions: ['update'],
         },
         price: {
-            actions: ['pay', 'refund', 'deposit', 'withdraw', 'tax'],
+            actions: ['pay', 'refund', 'deposit', 'withdrawTransfer', 'tax', 'moveOut', 'moveIn', 'compensate'],
         },
         allowDeposit: {
             actions: ['update'],
@@ -163,7 +163,7 @@ const attrUpdateMatrix: AttrUpdateMatrix<EntityDict> = {
                 enabled: true,
             },
         },
-        withdrawTransferLossRatio: {            
+        withdrawTransferLossRatio: {
             actions: ['update'],
             filter: {
                 enabled: true,
@@ -205,7 +205,7 @@ const attrUpdateMatrix: AttrUpdateMatrix<EntityDict> = {
             actions: ['update'],
         },
         price: {
-            actions: ['pay', 'refund', 'deposit', 'withdraw', 'tax'],
+            actions: ['pay', 'refund', 'deposit', 'withdrawTransfer', 'tax', 'moveOut', 'moveIn', 'compensate'],
         }
     },
     withdrawAccount: {

src/entities/OfflineAccount.ts

@@ -13,6 +13,7 @@ import { Schema as Pay } from './Pay';
 import { Schema as SysAccountOper } from './SysAccountOper';
 import { Schema as AbstractAccount } from './AbstractAccount';
 import { Schema as WithdrawChannel } from './WithdrawChannel';
+import { SysAccountOperType as sysAction } from '../types/sysAccountOper';
 
 export interface Schema extends AbstractAccount {
     type: 'bank' | 'alipay' | 'wechat' | 'shouqianba' | 'others',
@@ -29,7 +30,7 @@ export interface Schema extends AbstractAccount {
     enabled: Boolean;
 };
 
-export type Action = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax';
+export type Action = sysAction | 'deposit' | 'tax';
 
 export const entityDesc: EntityDesc<Schema, Action, '', {
     type: Schema['type'];
@@ -62,14 +63,17 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
                     alipay: '支付宝',
                     wechat: '微信',
                     shouqianba: '收钱吧',
-                    others: '其它',                    
+                    others: '其它',
                 },
             },
             action: {
                 pay: '支付',
                 refund: '退款',
+                withdrawTransfer: '提现转账',
+                compensate: '补偿',
+                moveIn: '转入',
+                moveOut: '转出',
                 deposit: '充值',
-                withdraw: '提现',
                 tax: '渠道费',
             }
         },
@@ -87,9 +91,12 @@ export const entityDesc: EntityDesc<Schema, Action, '', {
         icon: {
             pay: '',
             refund: '',
+            withdrawTransfer: '',
+            compensate: '',
+            moveIn: '',
+            moveOut: '',
             deposit: '',
-            withdraw: '',
-            tax: '',            
+            tax: '',
         }
     },
 };

src/entities/SysAccountOper.ts

@@ -12,8 +12,7 @@ import { Schema as Pay } from './Pay';
 import { Schema as Refund } from './Refund';
 import { Schema as WithdrawTransfer } from './WithdrawTransfer';
 import { Schema as SysAccountMove } from './SysAccountMove';
-
-export type SysAccountOperType = 'pay' | 'refund' | 'withdrawTransfer' | 'compensate' | 'moveIn' | 'moveOut';
+import { SysAccountOperType } from '../types/sysAccountOper';
 
 export interface Schema extends EntityShape {
     delta: Price;
@@ -40,7 +39,7 @@ export const entityDesc: EntityDesc<Schema, '', '', {
                 pay: '关联支付',
                 refund: '关联退款',
                 withdrawTransfer: '关联转账提现',
-                sysAccountMove: '系统资金移动'
+                sysAccountMove: '系统资金移动',
             },
             v: {
                 type: {

src/entities/WpAccount.ts

@@ -13,6 +13,7 @@ import { Schema as System } from './System';
 import { Schema as SysAccountOper } from './SysAccountOper';
 import { Schema as AbstractAccount } from './AbstractAccount';
 import { Schema as WithdrawChannel } from './WithdrawChannel';
+import { SysAccountOperType as sysAction } from '../types/sysAccountOper';
 
 export interface Schema extends AbstractAccount {
     wechatPay: WechatPay;
@@ -27,7 +28,7 @@ export interface Schema extends AbstractAccount {
     enabled: Boolean;
 };
 
-export type Action = 'pay' | 'refund' | 'deposit' | 'withdraw' | 'tax';
+export type Action = sysAction | 'deposit' | 'tax';
 
 export const entityDesc: EntityDesc<Schema, Action> = {
     locales: {
@@ -53,8 +54,11 @@ export const entityDesc: EntityDesc<Schema, Action> = {
             action: {
                 pay: '支付',
                 refund: '退款',
+                withdrawTransfer: '提现转账',
+                compensate: '补偿',
+                moveIn: '转入',
+                moveOut: '转出',
                 deposit: '充值',
-                withdraw: '提现',
                 tax: '渠道费',
             }
         },
@@ -63,9 +67,12 @@ export const entityDesc: EntityDesc<Schema, Action> = {
         icon: {
             pay: '',
             refund: '',
+            withdrawTransfer: '',
+            compensate: '',
+            moveIn: '',
+            moveOut: '',
             deposit: '',
-            withdraw: '',
-            tax: '',            
+            tax: '',
         }
     }
 };

src/types/sysAccountOper.ts

@@ -0,0 +1 @@
+export type SysAccountOperType = 'pay' | 'refund' | 'withdrawTransfer' | 'compensate' | 'moveIn' | 'moveOut';