update

src/common/methods/request/resultInfo.ts

@@ -95,7 +95,7 @@ export function controlResultErrInfo(fn: Promise<any>) {
         return result
     }).catch(err => {
         console.error('查询数据失败：', err)
-        message.error(err)
+        message.error(err.message)
     })
 }
 

src/services/bus/account.ts

@@ -1,7 +1,6 @@
 import APP from '@/services';
 import { getLoginData } from '@/services/bus/login';
 import { LongType } from '@/services/socket/login/interface/index';
-import Long from 'long';
 
 /**
  * 获取资金账号列表
@@ -24,8 +23,7 @@ export const getAccoutIdList = (): string => {
 export const getAccount_longType = (): LongType | null => {
     const accountList = APP.get('accountList');
     if (accountList.length > 0) {
-        const { low, high, unsigned } = accountList[0].AccountId;
-        return new Long(low, high, unsigned);
+        return accountList[0].accountid;
     }
     return null;
 };

src/services/bus/index.ts

@@ -10,6 +10,7 @@ import ProtobufCtr from '@/services/socket/protobuf/index';
 import { localStorageUtil } from '@/utils/storage';
 import { message } from 'ant-design-vue';
 import { GetErmcpGoods, QueryDeliveryGoodsDetail } from '../go/ermcp/goodsInfo';
+import { getTaAccount } from '../go/TaAccount';
 
 /**
  * 全局数据刷新
@@ -34,7 +35,7 @@ export async function globalDataRefresh(): Promise<string> {
             } else {
                 // token校验成功 马上轮询
                 checkTokenLoop();
-                await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), LoginQuery(), QueryDeliveryGoodsDetail()])
+                await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), LoginQuery(), QueryDeliveryGoodsDetail(), getTaAccount()])
             }
         } else {
             // 重置数据中心数据

src/services/bus/login.ts

@@ -7,6 +7,7 @@ import { GetLoginID, LoginQuery } from '@/services/go/useInfo/index';
 import { localStorageUtil } from '@/utils/storage';
 import { sessionStorageUtil } from '@/utils/storage/index';
 import Long from 'long';
+import { getTaAccount } from '../go/TaAccount';
 import { logoutResponse } from '../socket/login';
 import { loginAction } from '../socket/login/index';
 import { LoginResponse, LongType } from '../socket/login/interface/index';
@@ -24,7 +25,7 @@ export const login = async (logidCode: string, password: String, byteArr: Uint8A
         const loginData = await loginAction(account, password, byteArr);
         // localstorage 缓存登录信息，处理页面刷新
         setLoginData(loginData);
-        await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), getServerTime(), LoginQuery(), QueryDeliveryGoodsDetail()])
+        await Promise.all([GetErmcpGoods(), GetPCMenus(), QueryTableDefine(), getServerTime(), LoginQuery(), QueryDeliveryGoodsDetail(), getTaAccount()])
         // await GetPCMenus();
         // await QueryTableDefine();
         // 获取服务时间

src/services/bus/system.ts

@@ -1,4 +1,3 @@
-import { queryAccountInfo } from '@/services/socket/account/index';
 import { parseReceivePush } from '@/services/socket/quota/adapter/index';
 import eventBus from '@/utils/eventBus';
 
@@ -23,7 +22,7 @@ export const notice = (logout: Function) => {
     // 注册资金变化通知; => 请求资金账户信息,计算资金账户盈亏,可用,净值等
     eventBus.$onOnly('moneyChangedNtf', (msg: string) => {
         eventBus.$emit('moneyChangedNtf_UI', msg);
-        queryAccountInfo('');
+        // queryAccountInfo('');
         console.warn(msg);
     });
     // 注册委托单撤单通知; => 刷委托单

src/services/dataCenter/interafce/account.ts

@@ -1,4 +1,3 @@
-import { LongType } from '@/services/socket/login/interface/index';
 
 /**
  * 用户信息
@@ -25,36 +24,64 @@ export interface UserInfo {
  *
  */
 export interface AccountListItem {
-    AccountId: Number; // 账户id
-    TradeStatus: Number; // 交易状态
-    Currency: String; // 币种
-    IsMain: Number; // 是否母账户
-    ParentAccountID: Number; // 所属母账户
-    TAAccountType: Number; // 内、外部
-    RelatedMainAccountID: Number; // 关联账户
-    Balance: Number; // 期初余额
-    CurrentBalance: Number; // 期末余额
-    UsedMargin: Number; // 占用保证金
-    FreezeMargin: Number; // 冻结保证金
-    OtherFreezeMargin: Number; // 其他冻结保证金
-    FreezeCharge: Number; // 手续费冻结
-    MortgageCredit: Number; // 授信金额
-    OtherCredit: Number; // 其它授信金额
-    OutAmountFreeze: Number; // 出金冻结
-    InAmount: Number; // 今日入金
-    OutAmount: Number; // 今日出金
-    PayCharge: Number; // 今日手续费支出
-    ClosePL: Number; // 今日平仓盈亏
-    CreditIncrease: Number; // 今日授信增加
-    CreditDecrease: Number; // 今日授信减少
-    OtherCreditIncrease: Number; // 今日其它授信增加
-    OtherCreditDecrease: Number; // 今日其它授信减少
-    TransferAmount: Number; // 今日划转金额
-    OtherPay: Number; // 其他支出
-    OtherIncome: Number; // 其他收入
-    OutThreshold: Number; // 出金阀值
-    IsMarketAccount: Number; // 是否机构接单账号0:不是1:是
-    Currencyid: Number; // 报价货币ID;
+    accountflag: number;//账户标识 - number;
+    //\1 (默认为number;
+    //， 当上级账户与本账户的关联用户均为自己时更新为1)
+    accountid: number;//资金账户ID
+    accountname: string;//账户名称
+    balance: number;//期初余额
+    capitalbalance: number;//本金余额[外部子账户实际出入金余额]
+    changeflag: number;//变动标志(当前账户资金有任何变动更新为1系统结算时更新number;
+    //;供清算时使用) number;
+    //：无变动 1：有变动
+    changetime: string;//账户状态变更时间
+    closepl: number;//今日平仓盈亏
+    creditdecrease: number;//今日授信减少
+    creditincrease: number;//今日授信增加
+    currencyid: number;//货币ID
+    currentbalance: number;//期末余额
+    freezecharge: number;//手续费冻结
+    freezemargin: number;//冻结保证金
+    fromaccountid: number;//所属上级账户
+    inamount: number;//今日入金金额(包括三方入金)
+    ismain: number;//是否母账号 number;
+    //:不是母账户 1:是母账户
+    ismarketaccount: number;//是否机构接单账号 number;
+    //:不是 1:是
+    isreckonaccount: number;//是否机构分润账号 number;
+    //:不是 1:是
+    mortgagecredit: number;//授信金额
+    orifreezecharge: number;//期初手续费冻结
+    orifreezemargin: number;//期初冻结保证金
+    orimortgagecredit: number;//期初授信金额
+    oriothercredit: number;//期初其它授信金额
+    oriotherfreezemargin: number;//期初其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)
+    orioutamountfreeze: number;//期初出金冻结
+    oriusedmargin: number;//期初占用保证金
+    othercredit: number;//其它授信金额
+    othercreditdecrease: number;//今日其它授信减少
+    othercreditincrease: number;//今日其它授信增加
+    otherfreezemargin: number;//其他冻结保证金(交割买方冻结 申购冻结 全款买入 商城买入)
+    otherincome: number;//其他收入(交割收款 申购收款 全款卖出 商城卖出 买家退货 会员手续费收入)
+    otherpay: number;//其他支出(交割付款 申购付款 全款买入 商城买入 卖家退货)
+    outamount: number;//今日出金金额(包括三方出金)
+    outamountfreeze: number;//出金冻结
+    outthreshold: number;//出金阈值
+    parentaccountid: number;//所属根账号
+    paycharge: number;//今日手续费支出
+    relatedaccountstatus: number;//关联用户交易权限状态 - 1:正常(可交易) 2:受限(可平仓，不可建仓) 3:冻结(不可交易)
+    relateduserid: number;//关联用户
+    serivcegroup: number;//服务分组
+    signstatus: number;//签约状态 - 1:未签约 2:签约待审核 3:签约中 4:已签约 5:解约待审核 6:解约中 7:已解约 8:已解绑 9:绑卡中
+    sublevelpath: string;//账号层级路径(逗号分隔,首尾加逗号)
+    taaccounttype: number;//账号类型 - 1:外部账号 2:内部账号 3:内部做市自营账号 4:内部做市接单账号
+    thirdinamount: number;//今日三方入金
+    thirdoutamount: number;//今日三方出金
+    tradestatus: number;//交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结) 6:待激活 7:已注销
+    tradestatuschangetime: string;//激活时间
+    transferamount: number;//今日划转金额(母子账号资金划转，从划入账号为正，从账号划出为负)
+    usedmargin: number;//占用保证金
+    userid: number;//用户ID
 }
 
 /**

src/services/go/TaAccount/index.ts

@@ -0,0 +1,14 @@
+import APP from '@/services';
+import { getLongTypeLoginID } from "@/services/bus/login";
+import { commonSearch_go } from "..";
+
+/**
+ * 
+ */
+export function getTaAccount() {
+    const loginID = getLongTypeLoginID()?.toNumber()
+    return commonSearch_go('/TaAccount/GetTaAccounts', { loginID }).then(res => {
+        APP.set('accountList', res);
+        return 'ok'
+    }).catch(err => { throw new Error(`获取资金账户信息失败：${err}`) })
+}

src/services/go/commonService/index.ts

@@ -19,7 +19,7 @@ export function getServerTime(): Promise<string> {
             return 'ok';
         })
         .catch((err: Error) => {
-            throw new Error('获取服务器时间数据错误：' + err.message);
+            throw new Error('获取服务器时间数据错误：' + err);
         });
 }
 
@@ -36,7 +36,7 @@ export function getAllEnums(autoid?: number): Promise<string> {
             return 'ok';
         })
         .catch((err: Error) => {
-            throw new Error('查询获取所有枚举信息：' + err.message);
+            throw new Error('查询获取所有枚举信息：' + err);
         });
 }
 
@@ -52,7 +52,7 @@ export function queryErrorInfos(rowNumber?: string): Promise<string> {
             return 'ok';
         })
         .catch((err: Error) => {
-            throw new Error('查询获取所有枚举信息：' + err.message);
+            throw new Error('查询获取所有枚举信息：' + err);
         });
 }
 
@@ -66,7 +66,7 @@ export function queryNoticeReaded(noticeID: number): Promise<string> {
     return commonSearch_go('/Common/NoticeReaded', param, 'post')
         .then(() => 'ok')
         .catch((err: Error) => {
-            throw new Error(`通知公告设置已读请求失败:${err.message}`);
+            throw new Error(`通知公告设置已读请求失败:${err}`);
         });
 }
 
@@ -76,7 +76,7 @@ export function queryNoticeReaded(noticeID: number): Promise<string> {
 export function queryNotice(): Promise<type.QueryNoticeRsp[]> {
     const param = { loginID: Number(getLongTypeLoginID()) };
     return commonSearch_go('/Common/QueryNotice', param).catch((err: Error) => {
-        throw new Error(`通知公告系统消息查询失败:${err.message}`);
+        throw new Error(`通知公告系统消息查询失败:${err}`);
     });
 }
 /**
@@ -94,7 +94,7 @@ export function GetPCMenus(): Promise<string> {
             return 'ok';
         })
         .catch((err: Error) => {
-            throw new Error(`获取PC交易端菜单失败:${err.message}`);
+            throw new Error(`获取PC交易端菜单失败:${err}`);
         });
 }
 
@@ -113,6 +113,6 @@ export function QueryTableDefine(): Promise<type.TableDefineRsp[]> {
             return res;
         })
         .catch((err: Error) => {
-            throw new Error(`查询交易端列表头信息:${err.message}`);
+            throw new Error(`查询交易端列表头信息:${err}`);
         });
 }

src/services/go/ermcp/account/index.ts

@@ -15,7 +15,7 @@ import {
  */
 export function QueryAccMgrBizGroupSet(req: ErmcpBizGroupReq): Promise<ErmcpBizGroupEx> {
     return commonSearch_go('/Ermcp/QueryUserInfo', { req }).catch((err) => {
-        throw new Error(`查询业务类型分组: ${err.message}`);
+        throw new Error(`查询业务类型分组: ${err}`);
     });
 }
 
@@ -27,7 +27,7 @@ export function QueryAccMgrBizGroupSet(req: ErmcpBizGroupReq): Promise<ErmcpBizG
 export function QueryAccMgrTaaccount(): Promise<ErmcpTaAccountEx[]> {
     const userid = getAreaUserId();
     return commonSearch_go('/Ermcp/QueryAccMgrTaaccount', { userid }).catch((err) => {
-        throw new Error(`查询账户管理期货账号: ${err.message}`);
+        throw new Error(`查询账户管理期货账号: ${err}`);
     });
 }
 
@@ -41,7 +41,7 @@ export function QueryAccMgrTaaccount(): Promise<ErmcpTaAccountEx[]> {
 export function QueryAccMgrLoginUser(querytype: number): Promise<ErmcpLoginUserEx[]> {
     const userid = getAreaUserId();
     return commonSearch_go('/Ermcp/QueryAccMgrLoginUser', { userid, querytype }).catch((err) => {
-        throw new Error(`查询账户管理登录账号: ${err.message}`);
+        throw new Error(`查询账户管理登录账号: ${err}`);
     });
 }
 
@@ -51,7 +51,7 @@ export function QueryAccMgrLoginUser(querytype: number): Promise<ErmcpLoginUserE
  */
 export function QueryFuturesCompany(): Promise<ErmcpFuturesCompany[]> {
     return commonSearch_go('/Ermcp/QueryFuturesCompany', {}).catch((err) => {
-        throw new Error(`查询期货公司: ${err.message}`);
+        throw new Error(`查询期货公司: ${err}`);
     });
 }
 
@@ -62,7 +62,7 @@ export function QueryFuturesCompany(): Promise<ErmcpFuturesCompany[]> {
  */
 export function QueryAccMgrRoleMenu(param: { userid: number, roleid?: string }): Promise<ErmcpRoleMenuEx[]> {
     return commonSearch_go('/Ermcp/QueryAccMgrRoleMenu', param).catch((err) => {
-        throw new Error(`查询账户管理角色详情: ${err.message}`);
+        throw new Error(`查询账户管理角色详情: ${err}`);
     });
 }
 
@@ -73,7 +73,7 @@ export function QueryAccMgrRoleMenu(param: { userid: number, roleid?: string }):
 export function QueryAccMgrRole(): Promise<ErmcpRole> {
     const userid = getUserId()
     return commonSearch_go('/Ermcp/QueryAccMgrRole', { userid }).catch((err) => {
-        throw new Error(`查询账户管理角色设置: ${err.message}`);
+        throw new Error(`查询账户管理角色设置: ${err}`);
     });
 }
 
@@ -84,6 +84,6 @@ export function QueryAccMgrRole(): Promise<ErmcpRole> {
  */
 export function QueryAccMgrTaAccountInfo(req: QueryAccMgrTaAccountInfoReq): Promise<ErmcpTaAccountInfo[]> {
     return commonSearch_go('/Ermcp/QueryAccMgrTaAccountInfo', req).catch((err) => {
-        throw new Error(`查询账户管理授信: ${err.message}`);
+        throw new Error(`查询账户管理授信: ${err}`);
     });
 }

src/services/go/ermcp/business-review/index.ts

@@ -21,7 +21,7 @@ export function QueryBusinessJs(req: QueryBusinessJsReq): Promise<QryBussinessJs
     }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp/QueryBusinessJs', param).catch((err) => {
-        throw new Error(`业务管理 - 交收: ${err.message}`);
+        throw new Error(`业务管理 - 交收: ${err}`);
     });
 }
 
@@ -36,7 +36,7 @@ export function QueryBusinessDj(req: QueryBusinessDjReq): Promise<QryBusinessDjR
     }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp/QueryBusinessDj', param).catch((err) => {
-        throw new Error(`业务管理 - 点价: ${err.message}`);
+        throw new Error(`业务管理 - 点价: ${err}`);
     });
 }
 
@@ -48,7 +48,7 @@ export function QueryTradeConfigTMP(): Promise<ErmcpTradeConfigTMP[]> {
         areauserid: getAreaUserId(), // 所属机构id
     }
     return commonSearch_go('/Ermcp/QueryTradeConfigTMP', param).catch((err) => {
-        throw new Error(`查询交易模板配置: ${err.message}`);
+        throw new Error(`查询交易模板配置: ${err}`);
     });
 }
 

src/services/go/ermcp/customInfo/index.ts

@@ -21,7 +21,7 @@ import { QueryCustomInfoEnum } from './type';
 export function QueryCustomInfo(queryType: QueryCustomInfoEnum): Promise<QueryCustomInfoType[]> {
     const MemberUserID = getAreaUserId();
     return commonSearch_go('/Ermcp/QueryUserInfo', { MemberUserID, queryType }).catch((err) => {
-        throw new Error(`查询客户资料: ${err.message}`);
+        throw new Error(`查询客户资料: ${err}`);
     });
 }
 
@@ -32,7 +32,7 @@ export function QueryCustomInfo(queryType: QueryCustomInfoEnum): Promise<QueryCu
  */
 export function QueryAddUserInfoApply(userInfoApply: AddUserInfoApplyReq): Promise<BaseResponse> {
     return commonUpdate_go('/Erms3/AddUserInfoApply', userInfoApply).catch((err) => {
-        throw new Error(`新增客户申请: ${err.message}`);
+        throw new Error(`新增客户申请: ${err}`);
     });
 }
 
@@ -47,7 +47,7 @@ export function QueryAddUserInfoApply(userInfoApply: AddUserInfoApplyReq): Promi
  */
 export function QueryModifyUserInfoApply(userInfoApply: ModifyUserInfoApplyReq): Promise<BaseResponse> {
     return commonUpdate_go('/Erms3/ModifyUserInfoApply', userInfoApply).catch((err) => {
-        throw new Error(`修改客户申请: ${err.message}`);
+        throw new Error(`修改客户申请: ${err}`);
     });
 }
 
@@ -58,7 +58,7 @@ export function QueryModifyUserInfoApply(userInfoApply: ModifyUserInfoApplyReq):
  */
 export function QueryModifyUserInfo(req: ModifyUserInfoReq): Promise<BaseResponse> {
     return commonUpdate_go('/Erms3/ModifyUserInfoApply', req).catch((err) => {
-        throw new Error(`修改客户申请状态: ${err.message}`);
+        throw new Error(`修改客户申请状态: ${err}`);
     });
 }
 
@@ -72,7 +72,7 @@ export function QueryDeleteUserInfoApply(req: DeleteUserReq): Promise<string> {
     return commonSearch_go('/Erms3/DeleteUserInfoApply', req,)
         .then(() => 'ok')
         .catch((err) => {
-            throw new Error(`删除客户申请: ${err.message}`);
+            throw new Error(`删除客户申请: ${err}`);
         });
 }
 
@@ -83,6 +83,6 @@ export function QueryDeleteUserInfoApply(req: DeleteUserReq): Promise<string> {
  */
 export function UpdateUserAccountStatus(req: UpdateUserAccountReq): Promise<BaseResponse> {
     return commonUpdate_go('/User/UpdateUserAccountStatus', req,).catch((err) => {
-        throw new Error(`更新用户状态: ${err.message}`);
+        throw new Error(`更新用户状态: ${err}`);
     });
 }

src/services/go/ermcp/exposure-report/index.ts

@@ -12,7 +12,7 @@ import * as type from './interface';
 export async function QueryExposureDayReport(tradedate: string): Promise<type.QueryExposureDayReportRsp[]> {
     const userid = getUsrId()
     return commonSearch_go('/Ermcp/QryReportDayExposure', { tradedate, userid }).catch(err => {
-        throw new Error(`查询敞口日报表: ${err.message}`);
+        throw new Error(`查询敞口日报表: ${err}`);
     });
 
 }

src/services/go/ermcp/exposure/index.ts

@@ -1,8 +1,7 @@
-import APP from '@/services';
+import { getUserId } from "@/services/bus/account";
+import { getAreaUserId, getUserAccountType } from "@/services/bus/user";
 import { commonSearch_go } from '@/services/go';
 import { Ermcp3AreaSpot, Ermcp3AreaSpotDetail, Ermcp3AreaSpotDetailReq, Ermcp3ExposureDetail, Ermcp3ExposureReq, ErmcpExposurePostion, ErmcpExposurePostionReq, ErmcpHedgePosition, ErmcpHedgePositionDetail, ErmcpHedgePositionDetailReq, ErmcpRealExposureModel } from '@/services/go/ermcp/exposure/interface';
-import {getUserId} from "@/services/bus/account";
-import {getAreaUserId, getUserAccountType} from "@/services/bus/user";
 
 /** ================================= 业务 - 敞口 ================================**/
 
@@ -13,7 +12,7 @@ import {getAreaUserId, getUserAccountType} from "@/services/bus/user";
 export function QueryActualExposure(): Promise<ErmcpRealExposureModel[]> {
     const userid = getUserId(); // 所属机构id
     return commonSearch_go('/Ermcp/QueryRealtimeExposure', { userid }).catch((err) => {
-        throw new Error(`查询敞口 -> 实时敞口: ${err.message}`);
+        throw new Error(`查询敞口 -> 实时敞口: ${err}`);
     });
 }
 
@@ -25,7 +24,7 @@ export function QueryActualExposure(): Promise<ErmcpRealExposureModel[]> {
 export function QueryActualExposureDetail(req: Ermcp3ExposureReq): Promise<Ermcp3ExposureDetail[]> {
     const userid = getAreaUserId(); // 用户id
     return commonSearch_go('/Ermcp3/QueryExposureDetail', { userid, ...req }).catch((err) => {
-        throw new Error(`查询敞口 ->实时敞口 -> 现货明细: ${err.message}`);
+        throw new Error(`查询敞口 ->实时敞口 -> 现货明细: ${err}`);
     });
 }
 
@@ -37,7 +36,7 @@ export function QueryActualExposureDetail(req: Ermcp3ExposureReq): Promise<Ermcp
 export function QueryAutualExposurePosition(req: ErmcpExposurePostionReq): Promise<ErmcpExposurePostion[]> {
     const userid = getUserId(); // 所属机构id
     return commonSearch_go('/Ermcp/QueryRealtimeExposurePosition', { userid, ...req }).catch((err) => {
-        throw new Error(`查询敞口 ->实时敞口 -> 期货明细: ${err.message}`);
+        throw new Error(`查询敞口 ->实时敞口 -> 期货明细: ${err}`);
     });
 }
 
@@ -49,7 +48,7 @@ export function QuerySpotPosition(): Promise<Ermcp3AreaSpot[]> {
     const userid = getUserId(); // 用户id
     const usertype = getUserAccountType();  // 用户类型 2-机构 7-企业成员
     return commonSearch_go('/Ermcp3/QueryExposureSpot', { userid, usertype }).catch((err) => {
-        throw new Error(`查询敞口 -> 现货头寸: ${err.message}`);
+        throw new Error(`查询敞口 -> 现货头寸: ${err}`);
     });
 }
 
@@ -62,7 +61,7 @@ export function QuerySpotPositionDetail(req: Ermcp3AreaSpotDetailReq): Promise<E
     const userid = getUserId(); // 用户id
     const usertype = getUserAccountType();  // 用户类型 2-机构 7-企业成员
     return commonSearch_go('/Ermcp3/QueryExposureSpotDetail', { userid, usertype, ...req }).catch((err) => {
-        throw new Error(`查询敞口 -> 现货头寸 -> 现货明细: ${err.message}`);
+        throw new Error(`查询敞口 -> 现货头寸 -> 现货明细: ${err}`);
     });
 }
 
@@ -73,7 +72,7 @@ export function QuerySpotPositionDetail(req: Ermcp3AreaSpotDetailReq): Promise<E
 export function QueryExposureHedgePosition(): Promise<ErmcpHedgePosition[]> {
     const userid = getUserId(); // 所属机构id
     return commonSearch_go('/Ermcp/QueryExposureHedgePosition', { userid }).catch((err) => {
-        throw new Error(`查询敞口 -> 期货头寸: ${err.message}`);
+        throw new Error(`查询敞口 -> 期货头寸: ${err}`);
     });
 }
 
@@ -85,6 +84,6 @@ export function QueryExposureHedgePosition(): Promise<ErmcpHedgePosition[]> {
 export function QueryExposureHedgePositionDetail(req: ErmcpHedgePositionDetailReq): Promise<ErmcpHedgePositionDetail[]> {
     const userid = getUserId(); // 所属机构id
     return commonSearch_go('/Ermcp/QueryExposureHedgePositionDetail', { userid, ...req }).catch((err) => {
-        throw new Error(`查询敞口->期货头寸->期货明细: ${err.message}`);
+        throw new Error(`查询敞口->期货头寸->期货明细: ${err}`);
     });
 }

src/services/go/ermcp/finance-report/index.ts

@@ -12,7 +12,7 @@ import * as type from './interface';
 export async function QueryFinanceDayReport(tradedate: string): Promise<type.QueryFinanceDayReportRsp[]> {
     const userid = getUsrId()
     return commonSearch_go('/Ermcp/QryReportDayFinance', { tradedate, userid }).catch(err => {
-        throw new Error(`查询财务日报表: ${err.message}`);
+        throw new Error(`查询财务日报表: ${err}`);
     });
 
 }
@@ -25,7 +25,7 @@ export async function QueryFinanceDayReport(tradedate: string): Promise<type.Que
 export async function QueryFinanceInvoiceDayReport(tradedate: string): Promise<type.QueryFinanceInvoiceDayReportRsp[]> {
     const userid = getUsrId()
     return commonSearch_go('/Ermcp3/QryReportDayFinanceFp', { tradedate, userid }).catch(err => {
-        throw new Error(`查询财务日报表发票: ${err.message}`);
+        throw new Error(`查询财务日报表发票: ${err}`);
     });
 
 }
@@ -38,7 +38,7 @@ export async function QueryFinanceInvoiceDayReport(tradedate: string): Promise<t
 export async function QueryFinancePayDayReport(tradedate: string): Promise<type.QueryFinancePayDayReportRsp[]> {
     const userid = getUsrId()
     return commonSearch_go('/Ermcp3/QryReportDayFinanceKx', { tradedate, userid }).catch(err => {
-        throw new Error(`查询财务日报表款项: ${err.message}`);
+        throw new Error(`查询财务日报表款项: ${err}`);
     });
 
 }
@@ -51,6 +51,6 @@ export async function QueryFinancePayDayReport(tradedate: string): Promise<type.
 export async function QueryFinanceMonthReport(tradedate: string): Promise<type.QueryFinanceMonthReportRsp[]> {
     const userid = getUsrId()
     return commonSearch_go('/Ermcp/QryReportMonthFinance', { cycletime: tradedate, userid }).catch(err => {
-        throw new Error(`查询财务月报表: ${err.message}`);
+        throw new Error(`查询财务月报表: ${err}`);
     });
 }

src/services/go/ermcp/finance-review/index.ts

@@ -19,7 +19,7 @@ export function QueryBusinessKx(req: QueryBusinessKxReq): Promise<QryBussinessKx
     }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp/QueryBusinessKx', param).catch((err) => {
-        throw new Error(`财务管理-款项: ${err.message}`);
+        throw new Error(`财务管理-款项: ${err}`);
     });
 }
 
@@ -34,6 +34,6 @@ export function QueryBusinessFp(req: QueryBusinessFpReq): Promise<QryBussinessFp
     }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp/QueryBusinessFp', param).catch((err) => {
-        throw new Error(`财务管理-发票: ${err.message}`);
+        throw new Error(`财务管理-发票: ${err}`);
     });
 }

src/services/go/ermcp/goodsInfo/index.ts

@@ -21,7 +21,7 @@ export function QueryDeliveryGoods(req: ErmcpDeliveryGoodsReq): Promise<ErmcpDel
     const userid = getUserId(); // 所属机构id
     const usertype = getUserAccountType();  //  用户类型 2-机构 7-企业成员
     return commonSearch_go('/Ermcp3/QueryDeliveryGoods', { usertype, userid, ...req }).catch((err) => {
-        throw new Error(`查询现货商品: ${err.message}`);
+        throw new Error(`查询现货商品: ${err}`);
     });
 }
 
@@ -34,7 +34,7 @@ export function QueryGoodsWrstandard(deliverygoodsid: number): Promise<Ermcp3Wrs
     const userid = getUserId(); // 所属机构id
     const usertype = getUserAccountType(); //  用户类型 2-机构 7-企业成员
     return commonSearch_go('/Ermcp3/QueryGoodsWrstandard', { userid, usertype, deliverygoodsid }).catch((err) => {
-        throw new Error(`查询商品品类: ${err.message}`);
+        throw new Error(`查询商品品类: ${err}`);
     });
 }
 
@@ -46,7 +46,7 @@ export function QueryGoodsbrand(): Promise<Ermcp3Brand[]> {
     const userid = getUserId(); // 用户id
     const usertype = getUserAccountType();  // 用户类型 2-机构 7-企业成员
     return commonSearch_go('/Ermcp3/QueryGoodsbrand', { userid, usertype }).catch((err) => {
-        throw new Error(`查询商品品牌: ${err.message}`);
+        throw new Error(`查询商品品牌: ${err}`);
     });
 }
 
@@ -60,7 +60,7 @@ export function QueryDeliveryGoodsDetail(): Promise<ErmcpDeliveryGoodsDetailEx[]
         APP.set('DeliveryGoodsList', res)
         return res
     }).catch((err) => {
-        throw new Error(`查询现货商品详情: ${err.message}`);
+        throw new Error(`查询现货商品详情: ${err}`);
     });
 }
 
@@ -74,7 +74,7 @@ export function QueryGoodsfGroup(excludecfg?: number): Promise<Ermcp3GoodsGroup[
     const usertype = getUserAccountType(); // 用户类型 2-机构 7-企业成员
     const param = excludecfg ? { userid, excludecfg, usertype } : { userid, usertype }
     return commonSearch_go('/Ermcp3/QueryGoodsGroup', param).catch((err) => {
-        throw new Error(`查询期货商品组: ${err.message}`);
+        throw new Error(`查询期货商品组: ${err}`);
     });
 }
 
@@ -87,7 +87,7 @@ export function QueryGoodsfGroup(excludecfg?: number): Promise<Ermcp3GoodsGroup[
 export function QueryMiddleGoods(status: number): Promise<ErmcpMiddleGoodsModel[]> {
     const userid = getUserId(); // 所属机构id
     return commonSearch_go('/Ermcp/QueryMiddleGoods', { userid, status }).catch((err) => {
-        throw new Error(`查询套保品种: ${err.message}`);
+        throw new Error(`查询套保品种: ${err}`);
     });
 }
 
@@ -102,7 +102,7 @@ export function QueryMiddleGoodsDetail(middlegoodsid?: number): Promise<Ermcp3Mi
     const param = middlegoodsid ? { userid, usertype, middlegoodsid } : { userid, usertype }
 
     return commonSearch_go('/Ermcp3/QueryMiddleGoodsDetail', param).catch((err) => {
-        throw new Error(`查询套保品种详情(套保品种/商品详情): ${err.message}`);
+        throw new Error(`查询套保品种详情(套保品种/商品详情): ${err}`);
     });
 }
 
@@ -118,7 +118,7 @@ export function GetErmcpGoods(lastUpdateTime?: string): Promise<string> {
         APP.set('Goods', res)
         return 'ok'
     }).catch((err) => {
-        throw new Error(`查询企业风管期货商品信息: ${err.message}`);
+        throw new Error(`查询企业风管期货商品信息: ${err}`);
     });
 }
 
@@ -130,7 +130,7 @@ export function GetErmcpGoods(lastUpdateTime?: string): Promise<string> {
 export function QueryMiddleGoodsChange(middlegoodsid: number): Promise<ErmcpMiddleGoodsChangeLog[]> {
     const userid = getUserId(); // 用户id
     return commonSearch_go('/Ermcp/QueryMiddleGoodsChangeLog', { userid, middlegoodsid }).catch((err) => {
-        throw new Error(`查询套保品种详情(套保品种/商品详情): ${err.message}`);
+        throw new Error(`查询套保品种详情(套保品种/商品详情): ${err}`);
     });
 }
 

src/services/go/ermcp/inventory-report/index.ts

@@ -1,9 +1,7 @@
 /** ================================= 报表 - 库存报表 ================================**/
-import APP from '@/services';
-import * as type from './interface';
 import { commonSearch_go } from '@/services/go/index';
-import { QueryAreaStockReportReq } from './interface';
-import { QueryAreaStockReportDetailReq } from './interface';
+import * as type from './interface';
+import { QueryAreaStockReportDetailReq, QueryAreaStockReportReq } from './interface';
 /**
  * 查询库存报表
  * @param queryInfo 查询信息
@@ -13,7 +11,7 @@ export async function QueryAreaStockReport(queryInfo: QueryAreaStockReportReq):
     try {
         return commonSearch_go('/Ermcp3/QueryAreaStockReport', queryInfo);
     } catch (err) {
-        throw new Error(`查询库存报表: ${err.message}`);
+        throw new Error(`查询库存报表: ${err}`);
     }
 }
 
@@ -26,6 +24,6 @@ export async function QueryAreaStockReportDetail(queryInfo: QueryAreaStockReport
     try {
         return commonSearch_go('/Ermcp3/QueryAreaStockReportDetail', queryInfo);
     } catch (err) {
-        throw new Error(`查询库存明细报表: ${err.message}`);
+        throw new Error(`查询库存明细报表: ${err}`);
     }
 }

src/services/go/ermcp/inventory-review/index.ts

@@ -12,6 +12,6 @@ export function QueryAreaStockApply(req: QueryAreaStockApplyReq): Promise<Ermcp3
     const param = { userid: getUserId() }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp3/QueryAreaStockApply', param).catch((err) => {
-        throw new Error(`查询库存申请: ${err.message}`);
+        throw new Error(`查询库存申请: ${err}`);
     });
 }

src/services/go/ermcp/order/index.ts

@@ -21,7 +21,7 @@ export function queryHisTradeDetail(req: QueryHisTradeDetailReq): Promise<QueryH
     const accountID = getSelectedAccountId()?.toString()
     req.accountID = accountID as string
     return commonSearch_go('/Order/QueryHisTradeDetail', req).catch((err) => {
-        throw new Error(`历史成交单查询（合约市场）: ${err.message}`);
+        throw new Error(`历史成交单查询（合约市场）: ${err}`);
     });
 }
 
@@ -34,7 +34,7 @@ export function queryHisTradeOrderDetail(req: QueryHisTradeOrderDetailReq): Prom
     const accountID = getSelectedAccountId()?.toString()
     req.accountID = accountID as string
     return commonSearch_go('/Order/QueryHisTradeOrderDetail', req).catch((err) => {
-        throw new Error(`历史委托单查询请求（合约市场）: ${err.message}`);
+        throw new Error(`历史委托单查询请求（合约市场）: ${err}`);
     });
 }
 
@@ -44,8 +44,10 @@ export function queryHisTradeOrderDetail(req: QueryHisTradeOrderDetailReq): Prom
  * @param req
  */
 export function queryTradeDetail(req: QueryTradeDetailReq): Promise<QueryTradeDetailRsp[]> {
+    const accountID = getSelectedAccountId()?.toString()
+    req.accountID = accountID as string
     return commonSearch_go('/Order/QueryTradeDetail', req).catch((err) => {
-        throw new Error(`成交单查询（合约市场）: ${err.message}`);
+        throw new Error(`成交单查询（合约市场）: ${err}`);
     });
 }
 
@@ -58,7 +60,7 @@ export function queryTradeOrderDetail(req: QueryTradeOrderDetailReq): Promise<Qu
     const accountID = getSelectedAccountId()?.toString()
     req.accountID = accountID as string
     return commonSearch_go('/Order/QueryTradeOrderDetail', req).catch((err) => {
-        throw new Error(`委托单查询请求（合约市场）: ${err.message}`);
+        throw new Error(`委托单查询请求（合约市场）: ${err}`);
     });
 }
 
@@ -71,7 +73,7 @@ export function queryTradePosition(radeMode?: string): Promise<QueryTradePositio
     const accountID = getSelectedAccountId()?.toString()
     const param = radeMode ? { accountID, radeMode } : { accountID }
     return commonSearch_go('/Order/QueryTradePosition', param).catch((err) => {
-        throw new Error(`仓汇总查询（合约市场）: ${err.message}`);
+        throw new Error(`仓汇总查询（合约市场）: ${err}`);
     });
 }
 

src/services/go/ermcp/order/interface.ts

@@ -180,7 +180,7 @@ export interface QueryHisTradeOrderDetailRsp {
  * 成交单查询（合约市场）
  */
 export interface QueryTradeDetailReq {
-    accountID: string  //    资金账户 - 格式：1,2,3
+    accountID?: string  //    资金账户 - 格式：1,2,3
     tradeID?: number //      成交单号
     orderID?: number//       委托单号
     tradeMode?: string//     交易模式 - 格式：1,2,3

src/services/go/ermcp/plan/index.ts

@@ -15,6 +15,6 @@ export function QueryHedgePlan(hedgeplanstatus: string): Promise<Ermcp3HedgePlan
         hedgeplanstatus: hedgeplanstatus,
     }
     return commonSearch_go('/Ermcp3/QueryHedgePlan', param).catch((err) => {
-        throw new Error(`查询套保计划: ${err.message}`);
+        throw new Error(`查询套保计划: ${err}`);
     });
 }

src/services/go/ermcp/purchase/index.ts

@@ -19,7 +19,7 @@ export function QueryPurchase(req: SellBuyContractReq): Promise<Ermcp3SellBuyCon
     }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp3/QuerySpotContractBS', param).catch((err) => {
-        throw new Error(`查询采购信息: ${err.message}`);
+        throw new Error(`查询采购信息: ${err}`);
     });
 }
 

src/services/go/ermcp/qhj/index.ts

@@ -1,5 +1,6 @@
 
 /** ================================= 前海金相关接口 ================================**/
+import { getSelectedAccountId } from "@/services/bus/account";
 import { getUsrId } from "@/services/bus/user";
 import { commonSearch_go } from "@/services/go";
 import {
@@ -28,7 +29,7 @@ import {
 export function queryTradeGoodsPickup(): Promise<QhjTradeGoodsPickup[]> {
     const userid = getUsrId()
     return commonSearch_go('/Qhj/QueryTradeGoodsPickup', { userid }).catch((err) => {
-        throw new Error(`查询提货: ${err.message}`);
+        throw new Error(`查询提货: ${err}`);
     });
 }
 
@@ -39,7 +40,7 @@ export function queryTradeGoodsPickup(): Promise<QhjTradeGoodsPickup[]> {
  */
 export function queryAccountInOutApply(req: QueryAccountInOutApplyReq): Promise<QhjAccountOutInApply[]> {
     return commonSearch_go('/Qhj/QueryAccountInOutApply', req).catch((err) => {
-        throw new Error(`查询充值提现: ${err.message}`);
+        throw new Error(`查询充值提现: ${err}`);
     });
 }
 
@@ -50,7 +51,7 @@ export function queryAccountInOutApply(req: QueryAccountInOutApplyReq): Promise<
  */
 export function queryReckonPriceLog(req: QueryReckonPriceLogReq): Promise<QhjReckonPriceLog[]> {
     return commonSearch_go('/Qhj/QueryReckonPriceLog', req).catch((err) => {
-        throw new Error(`定投价查询: ${err.message}`);
+        throw new Error(`定投价查询: ${err}`);
     });
 }
 
@@ -63,7 +64,7 @@ export function queryRSTriggerLog(status?: 1 | 2 | 3): Promise<QhjRSTriggerLog[]
     const userid = getUsrId();
     const param = status ? { userid, status } : { userid }
     return commonSearch_go('/Qhj/QueryRSTriggerLog', param).catch((err) => {
-        throw new Error(`查询定投记录: ${err.message}`);
+        throw new Error(`查询定投记录: ${err}`);
     });
 }
 
@@ -76,7 +77,7 @@ export function queryRStrategy(status?: 1 | 2 | 3): Promise<QhjRStrategy[]> {
     const userid = getUsrId();
     const param = status ? { userid, status } : { userid }
     return commonSearch_go('/Qhj/QueryRStrategy', param).catch((err) => {
-        throw new Error(`查询定投设置: ${err.message}`);
+        throw new Error(`查询定投设置: ${err}`);
     });
 }
 
@@ -89,7 +90,7 @@ export function queryContract(scfcontractid?: number): Promise<QhjContract[]> {
     const userid = getUsrId();
     const param = scfcontractid ? { userid, scfcontractid } : { userid }
     return commonSearch_go('/Qhj/QueryContract', param).catch((err) => {
-        throw new Error(`查询融资明细(合同): ${err.message}`);
+        throw new Error(`查询融资明细(合同): ${err}`);
     });
 }
 
@@ -104,7 +105,7 @@ export function queryCustomerInfo(req: QueryCustomerInfoReq): Promise<QhjCustome
     console.log(req);
 
     return commonSearch_go('/Qhj/QueryCustomerInfo', req).catch((err) => {
-        throw new Error(`查询客户资料: ${err.message}`);
+        throw new Error(`查询客户资料: ${err}`);
     });
 }
 
@@ -117,7 +118,7 @@ export function queryCustomerInfo(req: QueryCustomerInfoReq): Promise<QhjCustome
 export function queryParentAreaList(): Promise<QhjParentAreaList[]> {
     const userid = getUsrId()
     return commonSearch_go('/Qhj/QueryParentAreaList', { userid }).catch((err) => {
-        throw new Error(`查询所属机构列表: ${err.message}`);
+        throw new Error(`查询所属机构列表: ${err}`);
     });
 }
 
@@ -129,7 +130,7 @@ export function queryParentAreaList(): Promise<QhjParentAreaList[]> {
 export function queryPickGoods(status?: 1 | 2 | 3): Promise<QhjPickGoods[]> {
     const param = status ? { status } : {}
     return commonSearch_go('/Qhj/QueryPickGoods', param).catch((err) => {
-        throw new Error(`查询所属机构列表: ${err.message}`);
+        throw new Error(`查询所属机构列表: ${err}`);
     });
 }
 
@@ -139,8 +140,10 @@ export function queryPickGoods(status?: 1 | 2 | 3): Promise<QhjPickGoods[]> {
  * @param req
  */
 export function queryPayOrder(req: QueryPayOrderReq): Promise<QhjPayOrder[]> {
+    const accountid = getSelectedAccountId()?.toNumber()
+    req.accountid = accountid as number
     return commonSearch_go('/Qhj/QueryPayOrder', req).catch((err) => {
-        throw new Error(`查询待付款单据: ${err.message}`);
+        throw new Error(`查询待付款单据: ${err}`);
     });
 }
 

src/services/go/ermcp/qhj/interface.ts

@@ -353,7 +353,7 @@ export interface QhjPickGoods {
  * 查询待付款单据
  */
 export interface QueryPayOrderReq {
-    accountid: number  // 资金账号id
+    accountid?: number  // 资金账号id
     tradeid?: number   // 成交单号
     payflag?: number    // 付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
 }
@@ -361,29 +361,29 @@ export interface QueryPayOrderReq {
 /**
  * 查询待付款单据返回
  */
-export interface QhjPayOrder{
-    buyaccountid	:number;//买方账号ID[报价币种]
-    buyorderid	:string;//买方委托单号
-    createtime	:string;//创建时间
-    goodscode	:string;//商品代码
-    goodsid	:number;//商品ID
-    goodsname	:string;//商品名称
-    marketid	:number;//市场ID
-    offamount	:number;//优惠金额
-    operatetype	:number;//买委托操作类型 - 1:正常下单 16:融资买入
-    payamount	:number;//支付金额=TradeAmount + TradeCharge
-    payflag	:number;//付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
-    paylimitedtime	:string;//支付期限
-    paytime	:string;//付款时间
-    sellaccountid	:number;//卖方账号ID[报价币种]
-    sellorderid	:string;//卖方委托单号
-    tradeamount	:number;//成交金额(优惠后金额)
-    tradecharge	:number;//成交手续费(买方)
-    tradedate	:string;//交易日(yyyyMMdd)
-    tradeid	:string;//成交单号(1number;
-//1+Unix秒时间戳(1number;
-//位)+2位(MarketServiceID)+xxxx)
-    tradeprice	:number;//成交价格
-    tradeqty	:number;//成交数量
+export interface QhjPayOrder {
+    buyaccountid: number;//买方账号ID[报价币种]
+    buyorderid: string;//买方委托单号
+    createtime: string;//创建时间
+    goodscode: string;//商品代码
+    goodsid: number;//商品ID
+    goodsname: string;//商品名称
+    marketid: number;//市场ID
+    offamount: number;//优惠金额
+    operatetype: number;//买委托操作类型 - 1:正常下单 16:融资买入
+    payamount: number;//支付金额=TradeAmount + TradeCharge
+    payflag: number;//付款标识 - 1:未支付 2:已支付 3:已过期 4:已撤销 5:结算过期 6:预售终止
+    paylimitedtime: string;//支付期限
+    paytime: string;//付款时间
+    sellaccountid: number;//卖方账号ID[报价币种]
+    sellorderid: string;//卖方委托单号
+    tradeamount: number;//成交金额(优惠后金额)
+    tradecharge: number;//成交手续费(买方)
+    tradedate: string;//交易日(yyyyMMdd)
+    tradeid: string;//成交单号(1number;
+    //1+Unix秒时间戳(1number;
+    //位)+2位(MarketServiceID)+xxxx)
+    tradeprice: number;//成交价格
+    tradeqty: number;//成交数量
 }
 

src/services/go/ermcp/report/index.ts

@@ -23,7 +23,7 @@ export function qryAreaExpourseReport(req: AreaExpourseReportReq): Promise<Ermcp
         req.userid = getUserId()
     }
     return commonSearch_go('/Ermcp3/QryAreaExpourseReport', req).catch((err) => {
-        throw new Error(`查询敞口报表: ${err.message}`);
+        throw new Error(`查询敞口报表: ${err}`);
     });
 }
 
@@ -35,7 +35,7 @@ export function qryAreaSpotplReport(req: AreaSpotplReportReq): Promise<Ermcp3Are
         req.userid = getUserId()
     }
     return commonSearch_go('/Ermcp3/QryAreaSpotplReport', req).catch((err) => {
-        throw new Error(`查询现货报表: ${err.message}`);
+        throw new Error(`查询现货报表: ${err}`);
     });
 }
 
@@ -48,7 +48,7 @@ export function qryAreaStockReport(req: AreaStockReportReq): Promise<Ermcp3AreaS
         req.userid = getUserId()
     }
     return commonSearch_go('/Ermcp3/QryAreaStockReport', req).catch((err) => {
-        throw new Error(`查询库存报表: ${err.message}`);
+        throw new Error(`查询库存报表: ${err}`);
     });
 }
 
@@ -61,7 +61,7 @@ export function qryFinanceReport(req: FinanceReportReq): Promise<Ermcp3FinanceRe
         req.userid = getUserId()
     }
     return commonSearch_go('/Ermcp3/QryFinanceReport', req).catch((err) => {
-        throw new Error(`查询财务报表: ${err.message}`);
+        throw new Error(`查询财务报表: ${err}`);
     });
 }
 
@@ -71,7 +71,7 @@ export function qryFinanceReport(req: FinanceReportReq): Promise<Ermcp3FinanceRe
 export function qryAreaSumPL(req: QryAreaSumPLReq): Promise<Ermcp3ArealSumPL[]> {
     req.userid = getUserId()
     return commonSearch_go('/Ermcp3/QryAreaSumPL', req).catch((err) => {
-        throw new Error(`查询汇总损益表: ${err.message}`);
+        throw new Error(`查询汇总损益表: ${err}`);
     });
 }
 
@@ -81,6 +81,6 @@ export function qryAreaSumPL(req: QryAreaSumPLReq): Promise<Ermcp3ArealSumPL[]>
 export function qryTaFutureDataReport(req: QryTaFutureDataReportReq): Promise<Ermcp3TaFutuReDataReport[]> {
     req.userid = getUserId()
     return commonSearch_go('/Ermcp3/QryTaFutureDataReport', req).catch((err) => {
-        throw new Error(`查询期货报表: ${err.message}`);
+        throw new Error(`查询期货报表: ${err}`);
     });
 }

src/services/go/ermcp/search-inventory/index.ts

@@ -14,7 +14,7 @@ import {
 export function QueryAreaStock(): Promise<Ermcp3AreaStock[]> {
     const userid = getUserId(); // 所属机构id
     return commonSearch_go('/Ermcp3/QueryAreaStock', { userid }).catch((err) => {
-        throw new Error(`查询机构库存(库存管理/当前库存): ${err.message}`);
+        throw new Error(`查询机构库存(库存管理/当前库存): ${err}`);
     });
 }
 
@@ -27,6 +27,6 @@ export function QueryAreaStockApply(req: QueryAreaStockApplyReq): Promise<Ermcp3
     const userid = getUserId(); // 所属机构id
     Object.assign(req, { userid })
     return commonSearch_go('/Ermcp3/QueryAreaStockApply', req).catch((err) => {
-        throw new Error(`查询库存申请: ${err.message}`);
+        throw new Error(`查询库存申请: ${err}`);
     });
 }

src/services/go/ermcp/sell/index.ts

@@ -1,5 +1,4 @@
 /** ================================= 销售 ================================**/
-import APP from '@/services';
 import { getUserId } from '@/services/bus/account';
 import { commonSearch_go } from '@/services/go';
 import { Ermcp3SellBuyContract, SellBuyContractReq } from '@/services/go/ermcp/purchase/interface';
@@ -18,6 +17,6 @@ export function QueryWareHouse(req: SellBuyContractReq): Promise<Ermcp3SellBuyCo
     }
     Object.assign(param, req)
     return commonSearch_go('/Ermcp3/QuerySpotContractBS', param).catch((err) => {
-        throw new Error(`查询销售信息: ${err.message}`);
+        throw new Error(`查询销售信息: ${err}`);
     });
 }

src/services/go/ermcp/spot-contract/index.ts

@@ -1,5 +1,5 @@
 /** ================================= 现货合同 ================================**/
-import APP from '@/services';
+import { getUserId } from "@/services/bus/account";
 import { commonSearch_go } from '@/services/go';
 import {
     Ermcp3ContractReq,
@@ -7,7 +7,6 @@ import {
     ErmcpOPLogModel,
     QueryChangeLogReq
 } from '@/services/go/ermcp/spot-contract/interface';
-import {getUserId} from "@/services/bus/account";
 
 /**
  * 查询现货合同 /Ermcp3/QuerySpotContract
@@ -21,7 +20,7 @@ export function QuerySpotContract(req: Ermcp3ContractReq): Promise<Ermcp3Contrac
     const userid = getUserId(); // 所属机构id
     // const areauserid = 10000; // 所属机构id
     return commonSearch_go('/Ermcp3/QuerySpotContract', { userid, ...req }).catch((err) => {
-        throw new Error(`查询现货合同: ${err.message}`);
+        throw new Error(`查询现货合同: ${err}`);
     });
 }
 
@@ -32,7 +31,7 @@ export function QuerySpotContract(req: Ermcp3ContractReq): Promise<Ermcp3Contrac
  */
 export function QueryChangeLog(req: QueryChangeLogReq): Promise<ErmcpOPLogModel[]> {
     return commonSearch_go('/Ermcp/QueryChangeLog', req).catch((err) => {
-        throw new Error(`查询变更记录: ${err.message}`);
+        throw new Error(`查询变更记录: ${err}`);
     });
 }
 

src/services/go/ermcp/spot-report/index.ts

@@ -10,7 +10,7 @@ import { QuerySpotDayReportDetailReq, QuerySpotMonthReportDetailReq, QuerySpotPL
  */
 export async function QuerySpotPLReport(queryInfo: QuerySpotPLReportReq): Promise<type.QuerySpotPLReportRsp[]> {
     return commonSearch_go('/Ermcp3/QryReportAreaSpotPL', queryInfo).catch(err => {
-        throw new Error(`查询现货损益报表: ${err.message}`);
+        throw new Error(`查询现货损益报表: ${err}`);
     });
 
 }
@@ -23,7 +23,7 @@ export async function QuerySpotPLReport(queryInfo: QuerySpotPLReportReq): Promis
 export async function QuerySpotDayReport(tradedate: string): Promise<type.QuerySpotDayReportRsp[]> {
     const userid = getUsrId()
     return commonSearch_go('/Ermcp3/QryReportDaySpot', { tradedate, userid }).catch(err => {
-        throw new Error(`查询现货报表: ${err.message}`);
+        throw new Error(`查询现货报表: ${err}`);
     });
 
 }
@@ -35,7 +35,7 @@ export async function QuerySpotDayReport(tradedate: string): Promise<type.QueryS
  */
 export async function QuerySpotDayReportDetail(queryInfo: QuerySpotDayReportDetailReq): Promise<type.QuerySpotDayReportDetailRsp[]> {
     return commonSearch_go('/Ermcp3/QryReportDaySpotDetail', queryInfo).catch(err => {
-        throw new Error(`查询现货明细报表: ${err.message}`);
+        throw new Error(`查询现货明细报表: ${err}`);
     });
 }
 
@@ -47,7 +47,7 @@ export async function QuerySpotDayReportDetail(queryInfo: QuerySpotDayReportDeta
 export async function QuerySpotMonthReport(tradedate: string): Promise<type.QuerySpotMonthReportRsp[]> {
     const userid = getUsrId()
     return commonSearch_go('/Ermcp3/QryReportMonthSpot', { tradedate, userid }).catch(err => {
-        throw new Error(`查询现货月报表: ${err.message}`);
+        throw new Error(`查询现货月报表: ${err}`);
     });
 }
 
@@ -58,6 +58,6 @@ export async function QuerySpotMonthReport(tradedate: string): Promise<type.Quer
  */
 export async function QuerySpotMonthReportDetail(queryInfo: QuerySpotMonthReportDetailReq): Promise<type.QuerySpotMonthReportDetailRsp[]> {
     return commonSearch_go('/Ermcp3/QryReportMonthSpotDetail', { queryInfo }).catch(err => {
-        throw new Error(`查询现货月报表明细: ${err.message}`);
+        throw new Error(`查询现货月报表明细: ${err}`);
     });
 }

src/services/go/ermcp/warehouse-info/index.ts

@@ -15,7 +15,7 @@ import {
 export function QueryWareHouse(status: string): Promise<ErmcpWareHouseInfo[]> {
     const userid = getUserId()
     return commonSearch_go('/Ermcp/QueryWarehouseInfo', { userid, status }).catch((err) => {
-        throw new Error(`查询仓库信息: ${err.message}`);
+        throw new Error(`查询仓库信息: ${err}`);
     });
 }
 
@@ -26,7 +26,7 @@ export function QueryWareHouse(status: string): Promise<ErmcpWareHouseInfo[]> {
  */
 export function QueryAreaStock(userid: number): Promise<Ermcp3AreaStock[]> {
     return commonSearch_go('/Ermcp3/QueryAreaStock', { userid }).catch((err) => {
-        throw new Error(`查询机构库存(库存管理/当前库存): ${err.message}`);
+        throw new Error(`查询机构库存(库存管理/当前库存): ${err}`);
     });
 }
 
@@ -37,6 +37,6 @@ export function QueryAreaStock(userid: number): Promise<Ermcp3AreaStock[]> {
  */
 export function QueryAreaStockApply(spotcontractid: string): Promise<Ermcp3AreaStockApplySum[]> {
     return commonSearch_go('/Ermcp3/QueryAreaStockApplySum', { spotcontractid }).catch((err) => {
-        throw new Error(`查询已登记出入库信息(入库登记/已入库信息): ${err.message}`);
+        throw new Error(`查询已登记出入库信息(入库登记/已入库信息): ${err}`);
     });
 }

src/services/socket/account/index.ts

@@ -1,10 +1,8 @@
 import APP from '@/services';
 import { getLongTypeLoginID } from '@/services/bus/login';
-import { LastUpdateTimeModel } from '@/services/dataCenter/initDataModel/account';
 import { buildProtoReq50, parseProtoRsp50 } from '@/services/socket/protobuf/buildReq';
 import { Callback } from '@/utils/websocket/index';
 import { sha256 } from 'js-sha256';
-import { LastUpdateTime_enum } from './enum';
 import * as accountType from './interface/index';
 
 const getAccoutIdList = () => {
@@ -22,49 +20,49 @@ const getAccoutIdList = () => {
  * @param QueryItem 不填返回全部结果集，填写后表示按需查询，多个以“,”隔开
  * 1-账号信息 2-资金账户列表 3- 交易规则和费用规则 4- 最大通知id 5- 更新时间戳
  */
-export const queryAccountInfo = (QueryItem: string | number): Promise<string> => {
-    return new Promise((resolve, reject) => {
-        const LoginID = getLongTypeLoginID();
-        const params = {
-            protobufName: 'LoginQueryReq',
-            funCodeName: 'LoginQueryReq',
-            reqParams: { LoginID, QueryItem },
-        };
-        const package50 = buildProtoReq50(params);
-        APP.sendTradingServer(package50, undefined, {
-            onSuccess: (res) => {
-                const { isSuccess, result } = parseProtoRsp50(res, 'LoginQueryRsp');
-                if (isSuccess) {
-                    const { AccountInfo, TAAccountList, ParamValues } = result;
-                    // 数据中心存入用户信息
-                    APP.set('userInfo', AccountInfo);
-                    const accountList = TAAccountList.map((el: any) => {
-                        return el.TaAccountInfo;
-                    });
-                    // 数据中心存入资金账号列表
-                    APP.set('accountList', accountList);
-                    // 时间戳集合
-                    const lastUpdateTime: any = new LastUpdateTimeModel();
-                    ParamValues.forEach((el: any) => {
-                        const { Key, Value } = el;
-                        if (Key) {
-                            const name = LastUpdateTime_enum[Key];
-                            lastUpdateTime[name] = Number(Value);
-                        }
-                    });
-                    APP.set('lastUpdateTime', lastUpdateTime);
-                    // 注意：商品交易规则和费用规则列表 暂未做处理，需要处理在此处理, 具体查看 proto LoginQueryRsp
-                    resolve('ok');
-                } else {
-                    reject(result);
-                }
-            },
-            onFail: (err) => {
-                reject(err.message);
-            },
-        } as Callback);
-    });
-};
+// export const queryAccountInfo = (QueryItem: string | number): Promise<string> => {
+//     return new Promise((resolve, reject) => {
+//         const LoginID = getLongTypeLoginID();
+//         const params = {
+//             protobufName: 'LoginQueryReq',
+//             funCodeName: 'LoginQueryReq',
+//             reqParams: { LoginID, QueryItem },
+//         };
+//         const package50 = buildProtoReq50(params);
+//         APP.sendTradingServer(package50, undefined, {
+//             onSuccess: (res) => {
+//                 const { isSuccess, result } = parseProtoRsp50(res, 'LoginQueryRsp');
+//                 if (isSuccess) {
+//                     const { AccountInfo, TAAccountList, ParamValues } = result;
+//                     // 数据中心存入用户信息
+//                     APP.set('userInfo', AccountInfo);
+//                     const accountList = TAAccountList.map((el: any) => {
+//                         return el.TaAccountInfo;
+//                     });
+//                     // 数据中心存入资金账号列表
+//                     APP.set('accountList', accountList);
+//                     // 时间戳集合
+//                     const lastUpdateTime: any = new LastUpdateTimeModel();
+//                     ParamValues.forEach((el: any) => {
+//                         const { Key, Value } = el;
+//                         if (Key) {
+//                             const name = LastUpdateTime_enum[Key];
+//                             lastUpdateTime[name] = Number(Value);
+//                         }
+//                     });
+//                     APP.set('lastUpdateTime', lastUpdateTime);
+//                     // 注意：商品交易规则和费用规则列表 暂未做处理，需要处理在此处理, 具体查看 proto LoginQueryRsp
+//                     resolve('ok');
+//                 } else {
+//                     reject(result);
+//                 }
+//             },
+//             onFail: (err) => {
+//                 reject(err.message);
+//             },
+//         } as Callback);
+//     });
+// };
 
 /**
  * 查询机构角色市场权限

src/views/platinum/platinum_document_query/compoments/setup.ts

@@ -1,26 +0,0 @@
-import { InputList, SelectList } from "@/common/setup/filter/interface";
-import { ref } from "vue";
-
-export function handleFilterOption() {
-    const select = ref<SelectList[]>([
-        {
-            value: undefined,
-            key: 'contracttype1',
-            placeholder: '账号类型',
-            list: [
-                { value: 1, lable: '个人' },
-                { value: -1, lable: '企业' },
-            ],
-        },
-        {
-            value: undefined,
-            key: 'goodsid',
-            placeholder: '选择商品',
-            list: [
-            ],
-        },
-    ]);
-    const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'account' }];
-
-    return { select, input }
-}

src/views/platinum/platinum_document_query/list/order/index.vue

@@ -25,9 +25,8 @@
 import { defineComponent, initData, getTableColumns, getTableEvent, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
 import { queryTradeOrderDetail } from '@/services/go/ermcp/order';
 import { QueryTradeOrderDetailRsp } from '@/services/go/ermcp/order/interface';
-import { ref } from 'vue';
 import Filter from './compoments/filter/index.vue';
-// import ControlModal from './compoments/controlModal/index.vue';
+import { queryTableList } from './setup'
 
 export default defineComponent({
     name: 'platinum_document_query_order',
@@ -40,16 +39,12 @@ export default defineComponent({
         // 表格操作按钮列表
         const [firstBtn] = _getBtnList('platinum_document_query_order', false).value;
         // 表格列表数据
-        const loading = ref<boolean>(false);
-        const tableList = ref<QueryTradeOrderDetailRsp[]>([]);
+        const { loading, tableList, queryTable } = queryTableList()
         initData(() => {
             // 获取列表数据
-            Promise.all([queryTradeOrderDetail({})]).then((res) => {
-                tableList.value = res[0];
-            });
+            queryTable()
             // 注册表头信息 过滤
             registerColumn('table_pcweb_qhj_order', ['goodsid', 'ordertime', 'operatorid']);
-            // registerColumn('table_pcweb_qhj_withdrawal_review', ['warehousetype', 'warehousename', 'address']);
         });
 
         return {

src/views/platinum/platinum_document_query/list/order/setup.ts

@@ -1,51 +1,23 @@
-import { QueryWareHouse } from '@/services/go/ermcp/warehouse-info/index';
-import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface';
+import { queryHisTradeOrderDetail, queryTradeOrderDetail } from '@/services/go/ermcp/order';
+import { QueryTradeOrderDetailRsp } from '@/services/go/ermcp/order/interface';
 import { message } from 'ant-design-vue';
 import { ref } from 'vue';
 
-
-
-/**
- * 获取表格列表数据
- * @param type 
- * @returns 
- */
-export function queryTableList(type: string) {
+export function queryTableList() {
     // 加载状态
     const loading = ref<boolean>(false);
     // 表格数据
-    const tableList = ref<ErmcpWareHouseInfo[]>([]);
+    const tableList = ref<QueryTradeOrderDetailRsp[]>([]);
     function queryTable() {
-        QueryWareHouse('1')
-            .then((res) => {
-                tableList.value = res.map((e, i) => {
-                    return { ...e, key: String(i) };
-                });
-                loading.value = false;
-                console.log('查询列表', tableList);
-            })
-            .catch((err) => {
-                message.error(err);
-                loading.value = false;
-            });
+        loading.value = true
+        Promise.all([queryTradeOrderDetail({}), queryHisTradeOrderDetail({})]).then(res => {
+            tableList.value = res[0]
+            // res[1].forEach(el => {
+            //     tableList.value.push(el)
+            // })
+        }).catch(err => {
+            message.error('查询委托单失败：' + err)
+        }).finally(() => loading.value = false)
     }
     return { loading, tableList, queryTable }
-}
-
-// export function queryTableList(type: 'in' | 'out') {
-//     // 加载状态
-//     const loading = ref<boolean>(false);
-//     // 表格数据
-//     const tableList = ref<QhjAccountOutInApply[]>([]);
-//     function queryTable() {
-//         queryResultLoadingAndInfo(queryAccountInOutApply, loading)
-//             .then(res => {
-//                 //申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
-//                 const arr = type === 'in' ? [1, 3, 5, 7] : [2, 4, 6, 8]
-//                 tableList.value = res.filter((e: QhjAccountOutInApply) => arr.includes(e.executetype)).map((e: QhjAccountOutInApply, i: number) => {
-//                     return { ...e, key: String(i) };
-//                 });
-//             })
-//     }
-//     return { loading, tableList, queryTable }
-// }
+}

src/views/platinum/platinum_document_query/compoments/filter/index.vue → src/views/platinum/platinum_document_query/list/success/compoments/filter/index.vue

@@ -16,18 +16,38 @@
 <script lang="ts">
 import FilterOption from '@/common/components/filter/index.vue';
 import { defineComponent, ref } from 'vue';
-import { handleFilter } from '@/common/setup/filter';
-import { Moment } from 'moment';
-import { handleFilterOption } from '../setup';
+import { handleFilter, handleTimeFilter, InputList, SelectList } from '@/common/setup/filter';
 import { initData } from '@/common/methods';
 import { getGoodsList } from '@/services/bus/goods';
+import { Moment } from 'moment';
+
 export default defineComponent({
     name: 'filter-platinum_pick_query',
     components: { FilterOption },
     setup(props, context) {
         const date = ref<Moment[]>([]);
-        const { select, input } = handleFilterOption();
-        const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context);
+        const select = ref<SelectList[]>([
+            {
+                value: undefined,
+                key: 'contracttype1',
+                placeholder: '账号类型',
+                list: [
+                    { value: 1, lable: '个人' },
+                    { value: -1, lable: '企业' },
+                ],
+            },
+            {
+                value: undefined,
+                key: 'goodsid',
+                placeholder: '选择商品',
+                list: [],
+            },
+        ]);
+        const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'accountid' }];
+        // 范围时间内过滤
+        const { getFilterRangeTime } = handleTimeFilter('tradetime');
+
+        const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context, getFilterRangeTime(date));
         initData(() => {
             select.value[1].list = getGoodsList().map((e) => {
                 return { value: e.goodsid, lable: e.goodsname };

src/views/platinum/platinum_document_query/list/success/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 单据查询 成交单-->
   <div class="platinum_document_query_success">
-    <Filter />
+    <Filter @search="updateColumn" />
     <contextMenu :contextMenuList="firstBtn">
       <a-table :columns="columns"
                class="topTable hiddenFirstCol"
@@ -24,7 +24,7 @@
 <script lang="ts">
 import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
 import { ErmcpWareHouseInfo } from '@/views/information/warehouse-info/list';
-import Filter from '../../compoments/filter/index.vue';
+import Filter from './compoments/filter/index.vue';
 import { queryTableList } from './setup';
 // import ControlModal from './compoments/controlModal/index.vue';
 
@@ -39,18 +39,17 @@ export default defineComponent({
         // 表格操作按钮列表
         const [firstBtn] = _getBtnList('platinum_document_query_success', false).value;
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList('in');
+        const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
             queryTable();
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_deal_order', ['warehousetype', 'warehousename', 'address']);
-            // registerColumn('table_pcweb_qhj_withdrawal_review', ['warehousetype', 'warehousename', 'address']);
+            registerColumn('table_pcweb_qhj_deal_order', ['tradetime', 'accountid', 'goodsid']);
         });
 
         return {
             columns,
-
+            updateColumn,
             expandedRowKeys,
             selectedRow,
             Rowclick,

src/views/platinum/platinum_document_query/list/success/setup.ts

@@ -1,51 +1,24 @@
-import { QueryWareHouse } from '@/services/go/ermcp/warehouse-info/index';
-import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface';
+import { queryHisTradeDetail, queryTradeDetail } from '@/services/go/ermcp/order';
+import { QueryTradeDetailRsp } from '@/services/go/ermcp/order/interface';
 import { message } from 'ant-design-vue';
 import { ref } from 'vue';
 
 
-
-/**
- * 获取表格列表数据
- * @param type 
- * @returns 
- */
-export function queryTableList(type: string) {
+export function queryTableList() {
     // 加载状态
     const loading = ref<boolean>(false);
     // 表格数据
-    const tableList = ref<ErmcpWareHouseInfo[]>([]);
+    const tableList = ref<QueryTradeDetailRsp[]>([]);
     function queryTable() {
-        QueryWareHouse('1')
-            .then((res) => {
-                tableList.value = res.map((e, i) => {
-                    return { ...e, key: String(i) };
-                });
-                loading.value = false;
-                console.log('查询列表', tableList);
+        loading.value = true
+        Promise.all([queryTradeDetail({}), queryHisTradeDetail({})]).then(res => {
+            tableList.value = res[0]
+            res[1].forEach(el => {
+                tableList.value.push(el)
             })
-            .catch((err) => {
-                message.error(err);
-                loading.value = false;
-            });
+        }).catch(err => {
+            message.error('查询成交单失败：' + err)
+        }).finally(() => loading.value = false)
     }
     return { loading, tableList, queryTable }
-}
-
-// export function queryTableList(type: 'in' | 'out') {
-//     // 加载状态
-//     const loading = ref<boolean>(false);
-//     // 表格数据
-//     const tableList = ref<QhjAccountOutInApply[]>([]);
-//     function queryTable() {
-//         queryResultLoadingAndInfo(queryAccountInOutApply, loading)
-//             .then(res => {
-//                 //申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
-//                 const arr = type === 'in' ? [1, 3, 5, 7] : [2, 4, 6, 8]
-//                 tableList.value = res.filter((e: QhjAccountOutInApply) => arr.includes(e.executetype)).map((e: QhjAccountOutInApply, i: number) => {
-//                     return { ...e, key: String(i) };
-//                 });
-//             })
-//     }
-//     return { loading, tableList, queryTable }
-// }
+}

src/views/platinum/platinum_document_query/list/waiting/compoments/filter/index.vue

@@ -0,0 +1,79 @@
+<template>
+  <!-- 过滤 -->
+  <div class="filterTable">
+    <a-range-picker v-model:value="date"
+                    class="commonPicker"
+                    style="width: 200px"
+                    :show-time="{hideDisabledOptions: true}"
+                    format="YYYY-MM-DD" />
+    <FilterOption :selectList="selectList"
+                  :inputList="inputList"
+                  :fixedBtnList="fixedBtnList" />
+    <slot></slot>
+  </div>
+</template>
+
+<script lang="ts">
+import FilterOption from '@/common/components/filter/index.vue';
+import { defineComponent, ref } from 'vue';
+import { handleFilter, handleTimeFilter, InputList, SelectList } from '@/common/setup/filter';
+import { initData } from '@/common/methods';
+import { getGoodsList } from '@/services/bus/goods';
+import { Moment } from 'moment';
+
+export default defineComponent({
+    name: 'filter-platinum_pick_query',
+    components: { FilterOption },
+    setup(props, context) {
+        const date = ref<Moment[]>([]);
+        const select = ref<SelectList[]>([
+            {
+                value: undefined,
+                key: 'contracttype1',
+                placeholder: '账号类型',
+                list: [
+                    { value: 1, lable: '个人' },
+                    { value: -1, lable: '企业' },
+                ],
+            },
+            {
+                value: undefined,
+                key: 'goodsid',
+                placeholder: '选择商品',
+                list: [],
+            },
+        ]);
+        const input: InputList[] = [{ value: '', placeholder: '模糊搜索账号', key: 'buyaccountid' }];
+        // 范围时间内过滤
+        const { getFilterRangeTime } = handleTimeFilter('paylimitedtime');
+
+        const { selectList, inputList, fixedBtnList } = handleFilter(select, input, context, getFilterRangeTime(date));
+        initData(() => {
+            select.value[1].list = getGoodsList().map((e) => {
+                return { value: e.goodsid, lable: e.goodsname };
+            });
+        });
+        return {
+            date,
+            selectList,
+            inputList,
+            fixedBtnList,
+        };
+    },
+});
+</script>
+
+<style lang="less">
+.filterTable {
+    .commonPicker.ant-calendar-picker {
+        display: inline-flex;
+        padding-top: 9px;
+        padding-bottom: 6px;
+        margin-right: 10px;
+        .ant-input {
+            border: 0;
+            background: @m-grey9;
+        }
+    }
+}
+</style>;

src/views/platinum/platinum_document_query/list/waiting/index.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- 单据查询 待付单-->
   <div class="platinum_document_query_waiting">
-    <Filter />
+    <Filter @search="updateColumn" />
     <contextMenu :contextMenuList="firstBtn">
       <a-table :columns="columns"
                class="topTable hiddenFirstCol"
@@ -22,10 +22,10 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
-import { ErmcpWareHouseInfo } from '@/views/information/warehouse-info/list';
-import Filter from '../../compoments/filter/index.vue';
-import { queryTableList } from './setup';
+import { defineComponent, initData, getTableColumns, getTableEvent, queryTableList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
+import { queryPayOrder } from '@/services/go/ermcp/qhj';
+import { QhjPayOrder } from '@/services/go/ermcp/qhj/interface';
+import Filter from './compoments/filter/index.vue';
 // import ControlModal from './compoments/controlModal/index.vue';
 
 export default defineComponent({
@@ -35,22 +35,21 @@ export default defineComponent({
         // 表头数据
         const { columns, registerColumn, updateColumn } = getTableColumns();
         // 表格事件
-        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<ErmcpWareHouseInfo>({});
+        const { expandedRowKeys, selectedRow, Rowclick, btnClick } = getTableEvent<QhjPayOrder>({});
         // 表格操作按钮列表
         const [firstBtn] = _getBtnList('platinum_document_query_waiting', false).value;
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList('in');
+        const { loading, tableList, queryTable } = queryTableList();
         initData(() => {
             // 获取列表数据
-            queryTable();
+            queryTable(queryPayOrder, {});
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_qhj_pay_bill', ['warehousetype', 'warehousename', 'address']);
-            // registerColumn('table_pcweb_qhj_withdrawal_review', ['warehousetype', 'warehousename', 'address']);
+            registerColumn('table_pcweb_qhj_pay_bill', ['goodsid', 'ordertime', 'operatorid']);
         });
 
         return {
             columns,
-
+            updateColumn,
             expandedRowKeys,
             selectedRow,
             Rowclick,

src/views/platinum/platinum_document_query/list/waiting/setup.ts

@@ -1,51 +0,0 @@
-import { QueryWareHouse } from '@/services/go/ermcp/warehouse-info/index';
-import { ErmcpWareHouseInfo } from '@/services/go/ermcp/warehouse-info/interface';
-import { message } from 'ant-design-vue';
-import { ref } from 'vue';
-
-
-
-/**
- * 获取表格列表数据
- * @param type 
- * @returns 
- */
-export function queryTableList(type: string) {
-    // 加载状态
-    const loading = ref<boolean>(false);
-    // 表格数据
-    const tableList = ref<ErmcpWareHouseInfo[]>([]);
-    function queryTable() {
-        QueryWareHouse('1')
-            .then((res) => {
-                tableList.value = res.map((e, i) => {
-                    return { ...e, key: String(i) };
-                });
-                loading.value = false;
-                console.log('查询列表', tableList);
-            })
-            .catch((err) => {
-                message.error(err);
-                loading.value = false;
-            });
-    }
-    return { loading, tableList, queryTable }
-}
-
-// export function queryTableList(type: 'in' | 'out') {
-//     // 加载状态
-//     const loading = ref<boolean>(false);
-//     // 表格数据
-//     const tableList = ref<QhjAccountOutInApply[]>([]);
-//     function queryTable() {
-//         queryResultLoadingAndInfo(queryAccountInOutApply, loading)
-//             .then(res => {
-//                 //申请类型 - 1:出金 2:入金 3: 单边账调整:入金; 4:单边账调整:出金 5:外部母账户调整:入金 6:外部母账户调整:出金 7:外部子账户:入金 8:外部子账户:出金
-//                 const arr = type === 'in' ? [1, 3, 5, 7] : [2, 4, 6, 8]
-//                 tableList.value = res.filter((e: QhjAccountOutInApply) => arr.includes(e.executetype)).map((e: QhjAccountOutInApply, i: number) => {
-//                     return { ...e, key: String(i) };
-//                 });
-//             })
-//     }
-//     return { loading, tableList, queryTable }
-// }

swagger-to-ts/swagger.ts

@@ -1,15 +1,60 @@
 export interface Name{
-imageaddress	:string;//图片
-modifierid	:number;//修改人
-modifiername	:string;//修改人名称
-modifysrc	:number;//修改来源 - 1:管理端 2:终端
-pickupgoodsagreeunit	:number;//合约乘数
-pickupgoodsdesc	:string;//描述
-pickupgoodsid	:string;//提货商品ID
-pickupgoodsname	:string;//提货商品名称
-pickupgoodsstatus	:number;//状态 - 1:正常 2:停用 3:注销
-pickupgoodsunitid	:number;//单位ID
-preparedays	:number;//备货期(天)
-remark	:string;//备注
-updatetime	:string;//更新时间
+accountflag	:number;//账户标识 - number;
+//\1 (默认为number;
+//， 当上级账户与本账户的关联用户均为自己时更新为1)
+accountid	:number;//资金账户ID
+accountname	:string;//账户名称
+balance	:number;//期初余额
+capitalbalance	:number;//本金余额[外部子账户实际出入金余额]
+changeflag	:number;//变动标志(当前账户资金有任何变动更新为1系统结算时更新number;
+//;供清算时使用) number;
+//：无变动 1：有变动
+changetime	:string;//账户状态变更时间
+closepl	:number;//今日平仓盈亏
+creditdecrease	:number;//今日授信减少
+creditincrease	:number;//今日授信增加
+currencyid	:number;//货币ID
+currentbalance	:number;//期末余额
+freezecharge	:number;//手续费冻结
+freezemargin	:number;//冻结保证金
+fromaccountid	:number;//所属上级账户
+inamount	:number;//今日入金金额(包括三方入金)
+ismain	:number;//是否母账号 number;
+//:不是母账户 1:是母账户
+ismarketaccount	:number;//是否机构接单账号 number;
+//:不是 1:是
+isreckonaccount	:number;//是否机构分润账号 number;
+//:不是 1:是
+mortgagecredit	:number;//授信金额
+orifreezecharge	:number;//期初手续费冻结
+orifreezemargin	:number;//期初冻结保证金
+orimortgagecredit	:number;//期初授信金额
+oriothercredit	:number;//期初其它授信金额
+oriotherfreezemargin	:number;//期初其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)
+orioutamountfreeze	:number;//期初出金冻结
+oriusedmargin	:number;//期初占用保证金
+othercredit	:number;//其它授信金额
+othercreditdecrease	:number;//今日其它授信减少
+othercreditincrease	:number;//今日其它授信增加
+otherfreezemargin	:number;//其他冻结保证金(交割买方冻结 申购冻结 全款买入 商城买入)
+otherincome	:number;//其他收入(交割收款 申购收款 全款卖出 商城卖出 买家退货 会员手续费收入)
+otherpay	:number;//其他支出(交割付款 申购付款 全款买入 商城买入 卖家退货)
+outamount	:number;//今日出金金额(包括三方出金)
+outamountfreeze	:number;//出金冻结
+outthreshold	:number;//出金阈值
+parentaccountid	:number;//所属根账号
+paycharge	:number;//今日手续费支出
+relatedaccountstatus	:number;//关联用户交易权限状态 - 1:正常(可交易) 2:受限(可平仓，不可建仓) 3:冻结(不可交易)
+relateduserid	:number;//关联用户
+serivcegroup	:number;//服务分组
+signstatus	:number;//签约状态 - 1:未签约 2:签约待审核 3:签约中 4:已签约 5:解约待审核 6:解约中 7:已解约 8:已解绑 9:绑卡中
+sublevelpath	:string;//账号层级路径(逗号分隔,首尾加逗号)
+taaccounttype	:number;//账号类型 - 1:外部账号 2:内部账号 3:内部做市自营账号 4:内部做市接单账号
+thirdinamount	:number;//今日三方入金
+thirdoutamount	:number;//今日三方出金
+tradestatus	:number;//交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结) 6:待激活 7:已注销
+tradestatuschangetime	:string;//激活时间
+transferamount	:number;//今日划转金额(母子账号资金划转，从划入账号为正，从账号划出为负)
+usedmargin	:number;//占用保证金
+userid	:number;//用户ID
 }

swagger-to-ts/swagger.txt

@@ -1,40 +1,154 @@
 {
-imageaddress	string
-图片
+accountflag	integer
+账户标识 - 0\1 (默认为0， 当上级账户与本账户的关联用户均为自己时更新为1)
 
-modifierid	integer
-修改人
+accountid*	integer
+资金账户ID
 
-modifiername	string
-修改人名称
+accountname	string
+账户名称
 
-modifysrc	integer
-修改来源 - 1:管理端 2:终端
+balance	number
+期初余额
 
-pickupgoodsagreeunit	number
-合约乘数
+capitalbalance	number
+本金余额[外部子账户实际出入金余额]
 
-pickupgoodsdesc	string
-描述
+changeflag	integer
+变动标志(当前账户资金有任何变动更新为1系统结算时更新0;供清算时使用) 0：无变动 1：有变动
 
-pickupgoodsid	string
-提货商品ID
+changetime	string
+账户状态变更时间
 
-pickupgoodsname	string
-提货商品名称
+closepl	number
+今日平仓盈亏
 
-pickupgoodsstatus	integer
-状态 - 1:正常 2:停用 3:注销
+creditdecrease	number
+今日授信减少
 
-pickupgoodsunitid	integer
-单位ID
+creditincrease	number
+今日授信增加
 
-preparedays	integer
-备货期(天)
+currencyid	integer
+货币ID
 
-remark	string
-备注
+currentbalance	number
+期末余额
 
-updatetime	string
-更新时间
+freezecharge	number
+手续费冻结
+
+freezemargin	number
+冻结保证金
+
+fromaccountid	integer
+所属上级账户
+
+inamount	number
+今日入金金额(包括三方入金)
+
+ismain	integer
+是否母账号 0:不是母账户 1:是母账户
+
+ismarketaccount	integer
+是否机构接单账号 0:不是 1:是
+
+isreckonaccount	integer
+是否机构分润账号 0:不是 1:是
+
+mortgagecredit	number
+授信金额
+
+orifreezecharge	number
+期初手续费冻结
+
+orifreezemargin	number
+期初冻结保证金
+
+orimortgagecredit	number
+期初授信金额
+
+oriothercredit	number
+期初其它授信金额
+
+oriotherfreezemargin	number
+期初其他冻结保证金(出金冻结资金 交割买方冻结 申购冻结 全款买入 商城买入)
+
+orioutamountfreeze	number
+期初出金冻结
+
+oriusedmargin	number
+期初占用保证金
+
+othercredit	number
+其它授信金额
+
+othercreditdecrease	number
+今日其它授信减少
+
+othercreditincrease	number
+今日其它授信增加
+
+otherfreezemargin	number
+其他冻结保证金(交割买方冻结 申购冻结 全款买入 商城买入)
+
+otherincome	number
+其他收入(交割收款 申购收款 全款卖出 商城卖出 买家退货 会员手续费收入)
+
+otherpay	number
+其他支出(交割付款 申购付款 全款买入 商城买入 卖家退货)
+
+outamount	number
+今日出金金额(包括三方出金)
+
+outamountfreeze	number
+出金冻结
+
+outthreshold	number
+出金阈值
+
+parentaccountid	integer
+所属根账号
+
+paycharge	number
+今日手续费支出
+
+relatedaccountstatus	integer
+关联用户交易权限状态 - 1:正常(可交易) 2:受限(可平仓，不可建仓) 3:冻结(不可交易)
+
+relateduserid	integer
+关联用户
+
+serivcegroup	integer
+服务分组
+
+signstatus	integer
+签约状态 - 1:未签约 2:签约待审核 3:签约中 4:已签约 5:解约待审核 6:解约中 7:已解约 8:已解绑 9:绑卡中
+
+sublevelpath	string
+账号层级路径(逗号分隔,首尾加逗号)
+
+taaccounttype	integer
+账号类型 - 1:外部账号 2:内部账号 3:内部做市自营账号 4:内部做市接单账号
+
+thirdinamount	number
+今日三方入金
+
+thirdoutamount	number
+今日三方出金
+
+tradestatus	integer
+交易状态 - 1:正常 2:受限 3:冻结 4:禁止建仓(人工受限) 5:禁止交易(人工冻结) 6:待激活 7:已注销
+
+tradestatuschangetime	string
+激活时间
+
+transferamount	number
+今日划转金额(母子账号资金划转，从划入账号为正，从账号划出为负)
+
+usedmargin	number
+占用保证金
+
+userid*	integer
+用户ID
 }