Merge branch 'master' of http://192.168.31.240:3000/MTP2.0_New/MTP2.0_NEWMANAGE_WEB

public/locales/en-US.json

@@ -1,5 +1,5 @@
 {
-    "app":{
+    "app": {
         "name": "MTP Management System",
         "left1": "Welcome To",
         "left2": "MTP Background Management System"
@@ -194,7 +194,7 @@
         "pleaseenter": "Please Enter",
         "pleasechoice": "Please Choice",
         "operate": "Operate",
-        "current": "CUrrent",
+        "current": "Current",
         "history": "History",
         "baseinfo": "Base Information",
         "extendinfo": "Extend Information",
@@ -611,8 +611,8 @@
                         "authid": "Mobile："
                     },
                     "lock": {
-                        "tips1": "Confirm to unlock this account?" ,
-                        "tips2": "Confirm lock this account?" ,
+                        "tips1": "Confirm to unlock this account?",
+                        "tips2": "Confirm lock this account?",
                         "tips3": "Lock success ",
                         "tips4": "Unlocked successfully ",
                         "tips5": "Lock failure:",
@@ -637,7 +637,7 @@
                     }
                 },
                 "recover": {
-                    "tips": "Confirm to restore this trader?" ,
+                    "tips": "Confirm to restore this trader?",
                     "tips1": "The account status of the relevant login account will be restored separately in the login account."
                 }
             }
@@ -1121,7 +1121,7 @@
                     "subareagroupname": "SubareaGroupName",
                     "remark": "Remark"
                 },
-                "delete": { 
+                "delete": {
                     "tips": "Confirm delete group?"
                 },
                 "member": {
@@ -1228,7 +1228,7 @@
                     "parentusername": "ParentUserName",
                     "memberaccountname": "MemberAccountName",
                     "marketname": "Market",
-                    "goodsname": "GoodsName:", 
+                    "goodsname": "GoodsName:",
                     "listingselecttype": "ListingSelectType:",
                     "delistingtype": "DeListingType:",
                     "buildtype": "BuildType:",
@@ -1542,9 +1542,76 @@
                 }
             },
             "config": {},
-            "esign": {},
-            "institution_bank": {},
-            "investor_bank": {}
+            "esign": {
+                "userfullname": "UserFullName",
+                "loginid": "LoginID",
+                "esigntype": "EsignType",
+                "templatetype": "TemplatTtype",
+                "templatename": "TemplateName",
+                "recordstatus": "RecordStatus",
+                "updatetimestr": "UpdateTime",
+                "userid": "UserID",
+                "tips1": "Please enter user id",
+                "tips2": "Please choice record status"
+            },
+            "institution_bank": {
+                "accountid": "AccountID",
+                "accountcodename" : "AccountCodeName",
+                "balance": "Balance",
+                "currentbalance": "CurrentBalance",
+                "inamount": "InAmount",
+                "outamount" : "OutAmount",
+                "closepl": "ClosePL",
+                "floatpl": "FloatPL",
+                "freezecharge": "FreezeCharge",
+                "paycharge": "PayCharge",
+                "otherpay": "OtherPay",
+                "otherincome": "OtherInCome",
+                "freezemargin": "FreezeMargin",
+                "usedmargin": "UsedMargin",
+                "otherfreezemargin": "OtherFreezeMargin",
+                "outamountfreeze": "OutAmountFreeze",
+                "avaiablemoney": "AvaiableMoney",
+                "avaiableoutmoney": "AvaiableOutMoney",
+                "floatnetvalue": "FloatNetValue",
+                "cur_risk_rate": "Cur_Risk_Rate",
+                "memberid": "MemberID",
+                "accountstatus": "AccountStatus",
+                "sortfield": "Sort",
+                "sorttype1": "Descending",
+                "sorttype2": "Ascent",
+                "nolimit": "NoLimit"
+            },
+            "investor_bank": {
+                "accountid": "AccountID",
+                "accountcodename" : "AccountCodeName",
+                "balance": "Blance",
+                "currentbalance": "CurrentBalance",
+                "inamount": "InAmount",
+                "outamount" : "OutAmount",
+                "closepl": "ClosePL",
+                "floatpl": "FloatPL",
+                "freezecharge": "FreezeCharge",
+                "paycharge": "PayCharge",
+                "otherpay": "OtherPay",
+                "otherincome": "OtherInCome",
+                "freezemargin": "FreezeMargin",
+                "usedmargin": "UsedMargin",
+                "otherfreezemargin": "OtherFreezeMargin",
+                "outamountfreeze": "OutAmountFreeze",
+                "avaiablemoney": "AvaiableMoney",
+                "avaiableoutmoney": "AvaiableOutMoney",
+                "floatnetvalue": "FloatNetValue",
+                "cur_risk_rate": "Cur_Risk_Rate",
+                "accountcode": "AccountCode",
+                "memberid": "MemberID",
+                "sortfield": "Sort",
+                "sorttype1": "Descending",
+                "sorttype2": "Ascent",
+                "loginid": "LoginID",
+                "parentarea": "ParentArea",
+                "nolimit": "NoLimit"
+            }
         },
         "warehouse_receipt": {
             "wrsumm": {
@@ -1863,19 +1930,19 @@
             "icon": "Icon",
             "edit": {
                 "title": "Edit",
-                "authType": "权限类型",
-                "resourceCode": "权限代码",
-                "resourceTitle": "权限标题",
-                "resourceLevel": "所属层级",
-                "invalidTitle": "[无效的标题]",
-                "parentitle": "一级菜单",
-                "icon": "图标",
-                "url": "链接地址",
-                "component": "组件地址",
+                "authType": "AuthType",
+                "resourceCode": "ResourceCode",
+                "resourceTitle": "ResourceTitle",
+                "resourceLevel": "ResourceLevel",
+                "invalidTitle": "[InvalidTitle]",
+                "parentitle": "ParentTitle",
+                "icon": "Icon",
+                "url": "Url",
+                "component": "Component",
                 "remark": "Remark",
                 "sort": "Sort",
-                "show": "是否显示",
-                "buttontype": "按钮样式",
+                "show": "IsShow",
+                "buttontype": "ButtonType",
                 "default": "Default",
                 "primary": "Primary",
                 "success": "Success",
@@ -1890,11 +1957,11 @@
             }
         },
         "operation_log": {
-            "resourcecode": "操作模块代码",
-            "resourcename": "操作模块名称",
-            "logincode": "登录账户",
-            "username": "操作人",
-            "areaname": "所属机构",
+            "resourcecode": "ResourceCode",
+            "resourcename": "ResourceName",
+            "logincode": "LoginCode",
+            "username": "Operator",
+            "areaname": "AreaName",
             "content": "Content",
             "operatetime": "OperateTime",
             "tips1": "请输入用户名模糊查询",
@@ -1907,4 +1974,4 @@
         "user_blacklist": {}
     },
     "routes": {}
-}
+}

public/locales/th-TH.json

@@ -1,6 +1,6 @@
 {
-    "app":{
-        "name":"MTP后台管理系统",
+    "app": {
+        "name": "MTP后台管理系统",
         "left1": "欢迎使用",
         "left2": "MTP管理系统"
     },
@@ -1121,7 +1121,7 @@
                     "subareagroupname": "名称",
                     "remark": "备注"
                 },
-                "delete": { 
+                "delete": {
                     "tips": "确认删除分组？"
                 },
                 "member": {
@@ -1228,7 +1228,7 @@
                     "parentusername": "所属机构",
                     "memberaccountname": "所属会员",
                     "marketname": "市场",
-                    "goodsname": "商品：", 
+                    "goodsname": "商品：",
                     "listingselecttype": "挂牌点选类型：",
                     "delistingtype": "摘牌类型：",
                     "buildtype": "委托类型：",
@@ -1335,7 +1335,7 @@
                     "expiredate": "行权日：",
                     "refgoodsid": "参考商品：",
                     "swapdays": "掉期天数：",
-                    "title":"详情"
+                    "title": "详情"
                 },
                 "export": {
                     "tips": "确定导出表格数据？"
@@ -1538,13 +1538,80 @@
                 "relationOrderId": "关联单号",
                 "tips1": "输入资金账户ID",
                 "export": {
-                    "tips":"确定导出表格数据？"
+                    "tips": "确定导出表格数据？"
                 }
             },
             "config": {},
-            "esign": {},
-            "institution_bank": {},
-            "investor_bank": {}
+            "esign": {
+                "userfullname": "用户",
+                "loginid": "登录账号",
+                "esigntype": "协议类型",
+                "templatetype": "模板类型",
+                "templatename": "协议名称",
+                "recordstatus": "签署状态",
+                "updatetimestr": "更新时间",
+                "userid": "用户ID",
+                "tips1": "请输入用户ID",
+                "tips2": "请选择签署状态"
+            },
+            "institution_bank": {
+                "accountid": "资金账号",
+                "accountcodename" : "机构名称",
+                "balance": "期初余额",
+                "currentbalance": "期末余额",
+                "inamount": "今日入金",
+                "outamount" : "今日出金",
+                "closepl": "转让损益",
+                "floatpl": "浮动损益",
+                "freezecharge": "冻结手续费",
+                "paycharge": "手续费",
+                "otherpay": "其他支出",
+                "otherincome": "其他收入",
+                "freezemargin": "冻结保证金",
+                "usedmargin": "占用保证金",
+                "otherfreezemargin": "其他冻结",
+                "outamountfreeze": "出金冻结",
+                "avaiablemoney": "可用资金",
+                "avaiableoutmoney": "可出资金",
+                "floatnetvalue": "当前净值",
+                "cur_risk_rate": "风险率",
+                "memberid": "所属会员",
+                "accountstatus": "机构状态",
+                "sortfield": "排序",
+                "sorttype1": "降序",
+                "sorttype2": "升序",
+                "nolimit": "不限"
+            },
+            "investor_bank": {
+                "accountid": "资金账号",
+                "accountcodename" : "机构名称",
+                "balance": "期初余额",
+                "currentbalance": "期末余额",
+                "inamount": "今日入金",
+                "outamount" : "今日出金",
+                "closepl": "转让损益",
+                "floatpl": "浮动损益",
+                "freezecharge": "冻结手续费",
+                "paycharge": "手续费",
+                "otherpay": "其他支出",
+                "otherincome": "其他收入",
+                "freezemargin": "冻结保证金",
+                "usedmargin": "占用保证金",
+                "otherfreezemargin": "其他冻结",
+                "outamountfreeze": "出金冻结",
+                "avaiablemoney": "可用资金",
+                "avaiableoutmoney": "可出资金",
+                "floatnetvalue": "当前净值",
+                "cur_risk_rate": "风险率",
+                "accountcode": "交易商",
+                "memberid": "所属会员",
+                "sortfield": "排序",
+                "sorttype1": "降序",
+                "sorttype2": "升序",
+                "loginid": "登录账号",
+                "parentarea": "所属机构",
+                "nolimit": "不限"
+            }
         },
         "warehouse_receipt": {
             "wrsumm": {
@@ -1907,4 +1974,4 @@
         "user_blacklist": {}
     },
     "routes": {}
-}
+}

public/locales/zh-CN.json

@@ -1,6 +1,6 @@
 {
-    "app":{
-        "name":"MTP后台管理系统",
+    "app": {
+        "name": "MTP后台管理系统",
         "left1": "欢迎使用",
         "left2": "MTP管理系统"
     },
@@ -1121,7 +1121,7 @@
                     "subareagroupname": "名称",
                     "remark": "备注"
                 },
-                "delete": { 
+                "delete": {
                     "tips": "确认删除分组？"
                 },
                 "member": {
@@ -1228,7 +1228,7 @@
                     "parentusername": "所属机构",
                     "memberaccountname": "所属会员",
                     "marketname": "市场",
-                    "goodsname": "商品：", 
+                    "goodsname": "商品：",
                     "listingselecttype": "挂牌点选类型：",
                     "delistingtype": "摘牌类型：",
                     "buildtype": "委托类型：",
@@ -1335,7 +1335,7 @@
                     "expiredate": "行权日：",
                     "refgoodsid": "参考商品：",
                     "swapdays": "掉期天数：",
-                    "title":"详情"
+                    "title": "详情"
                 },
                 "export": {
                     "tips": "确定导出表格数据？"
@@ -1538,13 +1538,80 @@
                 "relationOrderId": "关联单号",
                 "tips1": "输入资金账户ID",
                 "export": {
-                    "tips":"确定导出表格数据？"
+                    "tips": "确定导出表格数据？"
                 }
             },
             "config": {},
-            "esign": {},
-            "institution_bank": {},
-            "investor_bank": {}
+            "esign": {
+                "userfullname": "用户",
+                "loginid": "登录账号",
+                "esigntype": "协议类型",
+                "templatetype": "模板类型",
+                "templatename": "协议名称",
+                "recordstatus": "签署状态",
+                "updatetimestr": "更新时间",
+                "userid": "用户ID",
+                "tips1": "请输入用户ID",
+                "tips2": "请选择签署状态"
+            },
+            "institution_bank": {
+                "accountid": "资金账号",
+                "accountcodename" : "机构名称",
+                "balance": "期初余额",
+                "currentbalance": "期末余额",
+                "inamount": "今日入金",
+                "outamount" : "今日出金",
+                "closepl": "转让损益",
+                "floatpl": "浮动损益",
+                "freezecharge": "冻结手续费",
+                "paycharge": "手续费",
+                "otherpay": "其他支出",
+                "otherincome": "其他收入",
+                "freezemargin": "冻结保证金",
+                "usedmargin": "占用保证金",
+                "otherfreezemargin": "其他冻结",
+                "outamountfreeze": "出金冻结",
+                "avaiablemoney": "可用资金",
+                "avaiableoutmoney": "可出资金",
+                "floatnetvalue": "当前净值",
+                "cur_risk_rate": "风险率",
+                "memberid": "所属会员",
+                "accountstatus": "机构状态",
+                "sortfield": "排序",
+                "sorttype1": "降序",
+                "sorttype2": "升序",
+                "nolimit": "不限"
+            },
+            "investor_bank": {
+                "accountid": "资金账号",
+                "accountcodename" : "机构名称",
+                "balance": "期初余额",
+                "currentbalance": "期末余额",
+                "inamount": "今日入金",
+                "outamount" : "今日出金",
+                "closepl": "转让损益",
+                "floatpl": "浮动损益",
+                "freezecharge": "冻结手续费",
+                "paycharge": "手续费",
+                "otherpay": "其他支出",
+                "otherincome": "其他收入",
+                "freezemargin": "冻结保证金",
+                "usedmargin": "占用保证金",
+                "otherfreezemargin": "其他冻结",
+                "outamountfreeze": "出金冻结",
+                "avaiablemoney": "可用资金",
+                "avaiableoutmoney": "可出资金",
+                "floatnetvalue": "当前净值",
+                "cur_risk_rate": "风险率",
+                "accountcode": "交易商",
+                "memberid": "所属会员",
+                "sortfield": "排序",
+                "sorttype1": "降序",
+                "sorttype2": "升序",
+                "loginid": "登录账号",
+                "parentarea": "所属机构",
+                "nolimit": "不限"
+            }
         },
         "warehouse_receipt": {
             "wrsumm": {
@@ -1907,4 +1974,4 @@
         "user_blacklist": {}
     },
     "routes": {}
-}
+}

public/locales/zh-TW.json

@@ -1,6 +1,6 @@
 {
-    "app":{
-        "name":"MTP後臺管理系統",
+    "app": {
+        "name": "MTP後臺管理系統",
         "left1": "歡迎使用",
         "left2": "MTP管理系統"
     },
@@ -653,7 +653,7 @@
                 "areaCode": "所屬會員\\機構"
             },
             "open": {
-               "userName": "用戶名稱",
+                "userName": "用戶名稱",
                 "memberUserName": "所屬會員",
                 "areaName": "所屬機構",
                 "openMode": "開戶方式",
@@ -1121,7 +1121,7 @@
                     "subareagroupname": "名稱",
                     "remark": "備註"
                 },
-                "delete": { 
+                "delete": {
                     "tips": "確認刪除分組？"
                 },
                 "member": {
@@ -1335,7 +1335,7 @@
                     "expiredate": "行權日：",
                     "refgoodsid": "參考商品：",
                     "swapdays": "掉期天數：",
-                    "title":"詳情"
+                    "title": "詳情"
                 },
                 "export": {
                     "tips": "確定導出表格數據？"
@@ -1538,13 +1538,80 @@
                 "relationOrderId": "關聯單號",
                 "tips1": "輸入資金賬戶ID",
                 "export": {
-                    "tips":"確定導出表格數據？"
+                    "tips": "確定導出表格數據？"
                 }
             },
             "config": {},
-            "esign": {},
-            "institution_bank": {},
-            "investor_bank": {}
+            "esign": {
+                "userfullname": "用户",
+                "loginid": "登录账号",
+                "esigntype": "协议类型",
+                "templatetype": "模板类型",
+                "templatename": "协议名称",
+                "recordstatus": "签署状态",
+                "updatetimestr": "更新时间",
+                "userid": "用户ID",
+                "tips1": "请输入用户ID",
+                "tips2": "请选择签署状态"
+            },
+            "institution_bank": {
+                "accountid": "资金账号",
+                "accountcodename" : "机构名称",
+                "balance": "期初余额",
+                "currentbalance": "期末余额",
+                "inamount": "今日入金",
+                "outamount" : "今日出金",
+                "closepl": "转让损益",
+                "floatpl": "浮动损益",
+                "freezecharge": "冻结手续费",
+                "paycharge": "手续费",
+                "otherpay": "其他支出",
+                "otherincome": "其他收入",
+                "freezemargin": "冻结保证金",
+                "usedmargin": "占用保证金",
+                "otherfreezemargin": "其他冻结",
+                "outamountfreeze": "出金冻结",
+                "avaiablemoney": "可用资金",
+                "avaiableoutmoney": "可出资金",
+                "floatnetvalue": "当前净值",
+                "cur_risk_rate": "风险率",
+                "memberid": "所属会员",
+                "accountstatus": "机构状态",
+                "sortfield": "排序",
+                "sorttype1": "降序",
+                "sorttype2": "升序",
+                "nolimit": "不限"
+            },
+            "investor_bank": {
+                "accountid": "资金账号",
+                "accountcodename" : "机构名称",
+                "balance": "期初余额",
+                "currentbalance": "期末余额",
+                "inamount": "今日入金",
+                "outamount" : "今日出金",
+                "closepl": "转让损益",
+                "floatpl": "浮动损益",
+                "freezecharge": "冻结手续费",
+                "paycharge": "手续费",
+                "otherpay": "其他支出",
+                "otherincome": "其他收入",
+                "freezemargin": "冻结保证金",
+                "usedmargin": "占用保证金",
+                "otherfreezemargin": "其他冻结",
+                "outamountfreeze": "出金冻结",
+                "avaiablemoney": "可用资金",
+                "avaiableoutmoney": "可出资金",
+                "floatnetvalue": "当前净值",
+                "cur_risk_rate": "风险率",
+                "accountcode": "交易商",
+                "memberid": "所属会员",
+                "sortfield": "排序",
+                "sorttype1": "降序",
+                "sorttype2": "升序",
+                "loginid": "登录账号",
+                "parentarea": "所属机构",
+                "nolimit": "不限"
+            }
         },
         "warehouse_receipt": {
             "wrsumm": {
@@ -1907,4 +1974,4 @@
         "user_blacklist": {}
     },
     "routes": {}
-}
+}

src/packages/pc/views/query/other/bank_inout/index.vue

@@ -3,6 +3,11 @@
     <app-view>
         <template #header>
             <app-filter :option="filterOption">
+                <template #accountcode="{ item }">
+                    <el-form-item :label="item.label" prop="accountcode">
+                        <app-select-account v-model="item.value" @change="onAccountChange" />
+                    </el-form-item>
+                </template>
                 <template #after>
                     <el-form-item :label="t('query.other.bank_inout.date')" prop="date">
                         <el-date-picker type="daterange" v-model="dateValue" value-format="YYYYMMDD"
@@ -10,6 +15,11 @@
                     </el-form-item>
                 </template>
             </app-filter>
+            <div class="report-account__info" v-if="selectedAccount">
+                <span>{{ t('report.account.accountid1') }}{{ selectedAccount.relatedname }}</span>
+                <span>{{ t('report.account.accountid') }}{{ selectedAccount.accountid }}</span>
+                <span>{{ t('report.account.invloginids') }}{{ selectedAccount.invloginids }}</span>
+            </div>
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <!-- 操作 -->
@@ -37,13 +47,15 @@ import { useDataFilter } from '@/hooks/datatable-v2'
 import { useOperation } from '@/hooks/operation'
 import { queryPutOrIn } from '@/services/api/account'
 import { getAllBankCus } from '@/services/api/bank'
+import AppSelectAccount from '@pc/components/modules/select-account/index.vue'
+import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
-import { i18n } from '@/stores'
 
 const { global: { t } } = i18n
+const selectedAccount = shallowRef<Model.TAAccountChildrenSelectRsp>()
 
 const executetypeEnum = useEnum('executetype') // 类型
 const applystatusEnum = useEnum('applystatus') // 状态
@@ -57,6 +69,11 @@ const { componentMap, componentId, record, openComponent, closeComponent, getAct
 
 const { dataList: bankList } = useRequest(getAllBankCus)
 
+const onAccountChange = (item?: Model.TAAccountChildrenSelectRsp) => {
+    selectedAccount.value = item
+}
+
+
 const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryPutOrIn, {
     manual: true,
     params: {

src/packages/pc/views/query/other/bank_statement/index.vue

@@ -15,7 +15,17 @@
                             :start-placeholder="t('common.start')" :end-placeholder="t('common.end')" />
                     </el-form-item>
                 </template>
+                <template #accountId="{ item }">
+                        <el-form-item :label="item.label" prop="accountId">
+                            <app-select-account v-model="item.value" @change="onAccountChange" />
+                        </el-form-item>
+                    </template>
             </app-filter>
+            <div class="report-account__info" v-if="selectedAccount">
+                <span>{{ t('report.account.accountid1') }}{{ selectedAccount.relatedname }}</span>
+                <span>{{ t('report.account.accountid') }}{{ selectedAccount.accountid }}</span>
+                <span>{{ t('report.account.invloginids') }}{{ selectedAccount.invloginids }}</span>
+            </div>
         </template>
         <app-table :data="dataList" :columns="tableColumns" :loading="loading">
             <template #headerLeft>
@@ -40,14 +50,15 @@ import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable-v2'
 import { useOperation } from '@/hooks/operation'
 import { queryAmountStream } from '@/services/api/account'
+import { i18n } from '@/stores'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
 import AppPagination from '@pc/components/base/pagination/index.vue'
 import AppOperation from '@pc/components/base/operation/index.vue'
-import { i18n } from '@/stores'
+import AppSelectAccount from '@pc/components/modules/select-account/index.vue'
 
 const { global: { t } } = i18n
-
+const selectedAccount = shallowRef<Model.TAAccountChildrenSelectRsp>()
 const { getEnumOptions } = useEnum('operatetypesearch') // 业务类型
 
 const dateValue = shallowRef<string[] | null>([])
@@ -117,6 +128,10 @@ const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilte
     ]
 })
 
+const onAccountChange = (item?: Model.TAAccountChildrenSelectRsp) => {
+    selectedAccount.value = item
+}
+
 // 处理请求参数
 const processRequiredParams = () => {
     const qs = getQueryParams()

src/packages/pc/views/query/other/esign/index.vue

@@ -1,7 +1,102 @@
 <!-- 查询管理-其它查询-电子协议管理 -->
 <template>
-    <app-view></app-view>
+    <app-view>
+        <app-filter :option="filterOption">
+
+        </app-filter>
+        <app-table :data="dataList" :columns="tableColumns" :loading="loading">
+            <template #footer>
+                <app-pagination :total="total" v-model:page-size="pageSize" v-model:page-index="pageIndex"
+                    @change="onSearch" />
+            </template>
+        </app-table>
+        <component :is="componentMap.get(componentId)" v-bind="{ record, queryParams }" @closed="closeComponent"
+            v-if="componentId" />
+    </app-view>
 </template>
 
 <script lang="ts" setup>
+import { formatDate } from '@/filters'
+import { useRequest } from '@/hooks/request'
+import { queryesignrecord } from '@/services/api/account'
+import { ElMessage } from 'element-plus'
+import { shallowRef } from 'vue'
+import { useDataFilter } from '@/hooks/datatable-v2'
+import { i18n } from '@/stores'
+import { useOperation } from '@/hooks/operation';
+import { useEnum } from '@/hooks/enum'
+import AppTable from '@pc/components/base/table/index.vue'
+import AppPagination from '@pc/components/base/pagination/index.vue'
+import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
+
+const { global: { t } } = i18n
+
+const { getEnumOptions, getEnumTypeName } = useEnum('esignrecordstatus') // 签署状态
+const esigntemplatetypeEnums = useEnum('esigntemplatetype') // 模板类型
+const esigntypeEnums = useEnum('esigntype') // 协议类型
+
+const dateValue = shallowRef<string[] | null>([])
+
+const { componentMap, componentId, record, closeComponent } = useOperation<Model.SignRecordReq>({
+    onClose: () => onSearch()
+})
+
+const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryesignrecord, {
+    manual: true,
+    params: {
+        pageNum: 1,
+        pageSize: 20
+    },
+    onError: (err) => {
+        ElMessage.error(err)
+    }
+})
+
+const tableColumns = shallowRef<Model.TableColumn[]>([
+    { field: 'userfullname', label: 'query.other.esign.userfullname' },
+    { field: 'loginid', label: 'query.other.esign.loginid' },
+    { field: 'esigntype', label: 'query.other.esign.esigntype', formatValue: (val) => esigntypeEnums.getEnumTypeName(val) },
+    { field: 'templatetype', label: 'query.other.esign.templatetype', formatValue: (val) => esigntemplatetypeEnums.getEnumTypeName(val) },
+    { field: 'templatename', label: 'query.other.esign.templatename' },
+    { field: 'recordstatus', label: 'query.other.esign.recordstatus', formatValue: (val) => getEnumTypeName(val) },
+    { field: 'updatetimestr', label: 'query.other.esign.updatetimestr', formatValue: (val) => formatDate(val) },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
+])
+
+const { filterOption, queryParams, getQueryParams, resetFilters } = useDataFilter<Model.SignRecordReq>({
+    filters: [
+        {
+            field: 'userid',
+            label: t('query.other.esign.userid'),
+            placeholder: t('query.other.esign.tips1')
+        },
+        {
+            field: 'recordstatus',
+            label:  t('query.other.esign.recordstatus'),
+            placeholder: t('query.other.esign.tips2'),
+            options: () => getEnumOptions()
+        }
+    ],
+    buttons: [
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => onReset() }
+    ]
+})
+
+// 处理请求参数
+const processRequiredParams = () => {
+    const qs = getQueryParams()
+    return qs
+}
+
+const onSearch = () => {
+    const qs = processRequiredParams()
+    run(qs)
+}
+
+const onReset = () => {
+    dateValue.value = []
+    resetFilters()
+}
+
 </script>

src/packages/pc/views/query/other/institution_bank/index.vue

@@ -1,7 +1,153 @@
 <!-- 查询管理-其它查询-机构资金查询 -->
 <template>
-    <app-view></app-view>
+    <app-view>
+        <template #header>
+            <app-filter :option="filterOption"  :rules="filterRules">
+                <template #memberid="{ item }">
+                    <el-form-item :label="item.label" prop="memberid">
+                        <app-select-member v-model="item.value" usertype="2" :placeholder="t('investor.custom.group.edit.tips1')" />
+                    </el-form-item>
+                </template>
+            </app-filter>
+        </template>
+        <app-table :data="dataList" :columns="tableColumns" :loading="loading">
+            <template #footer>
+                <app-pagination :total="total" v-model:page-size="pageSize" v-model:page-index="pageIndex"
+                    @change="onSearch" />
+            </template>
+        </app-table>
+        <component :is="componentMap.get(componentId)" v-bind="{ record, queryParams }" @closed="closeComponent"
+            v-if="componentId" />
+    </app-view>
 </template>
 
 <script lang="ts" setup>
+import { ref, shallowRef } from 'vue'
+import { ElMessage, FormRules } from 'element-plus'
+import { useDataFilter } from '@/hooks/datatable-v2'
+import { useRequest } from '@/hooks/request'
+import { useOperation } from '@/hooks/operation'
+import { queryinvestor } from '@/services/api/order'
+import { i18n } from '@/stores'
+import { useEnum } from '@/hooks/enum'
+import AppSelectMember from '@pc/components/modules/select-member/index.vue'
+import AppTable from '@pc/components/base/table/index.vue'
+import AppPagination from '@pc/components/base/pagination/index.vue'
+import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
+import { parsePercent } from '@/filters'
+
+const { global: { t } } = i18n
+const dateValue = shallowRef<string[] | null>([])
+
+const { getEnumOptions } = useEnum('accountstatus') // 业务类型
+
+const { componentMap, componentId, record, closeComponent } = useOperation<Model.investorReq>({
+    onClose: () => onSearch()
+})
+
+const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryinvestor, {
+    manual: true,
+    params: {
+        pageNum: 1,
+        pageSize: 20
+    },
+    onError: (err) => {
+        ElMessage.error(err)
+    }
+})
+
+const tableColumns = ref<Model.TableColumn[]>([
+    { field: 'accountid', label: 'query.other.institution_bank.accountid' },
+    { field: 'accountcodename', label: 'query.other.institution_bank.accountcodename' },
+    { field: 'balance', label: 'query.other.institution_bank.balance' },
+    { field: 'currentbalance', label: 'query.other.institution_bank.currentbalance' },
+    { field: 'inamount', label: 'query.other.institution_bank.inamount' },
+    { field: 'outamount', label: 'query.other.institution_bank.outamount' },
+    { field: 'closepl', label: 'query.other.institution_bank.closepl' },
+    { field: 'floatpl', label: 'query.other.institution_bank.floatpl' },
+    { field: 'freezecharge', label: 'query.other.institution_bank.freezecharge' },
+    { field: 'paycharge', label: 'query.other.institution_bank.paycharge' },
+    { field: 'otherpay', label: 'query.other.institution_bank.otherpay' },
+    { field: 'otherincome', label: 'query.other.institution_bank.otherincome' },
+    { field: 'freezemargin', label: 'query.other.institution_bank.freezemargin' },
+    { field: 'usedmargin', label: 'query.other.institution_bank.usedmargin' },
+    { field: 'otherfreezemargin', label: 'query.other.institution_bank.otherfreezemargin' },
+    { field: 'outamountfreeze', label: 'query.other.institution_bank.outamountfreeze' },
+    { field: 'avaiablemoney', label: 'query.other.institution_bank.avaiablemoney' },
+    { field: 'avaiableoutmoney', label: 'query.other.institution_bank.avaiableoutmoney' },
+    { field: 'floatnetvalue', label: 'query.other.institution_bank.floatnetvalue' },
+    { field: 'cur_risk_rate', label: 'query.other.institution_bank.cur_risk_rate', formatValue: (val) => parsePercent(val) },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
+])
+
+// 表单验证规则
+const filterRules: FormRules = {
+    date: [{
+        required: true,
+        validator: () => {
+            return !!dateValue.value && dateValue.value.length === 2
+        }
+    }]
+}
+
+const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.investorReq>({
+    filters: [
+        {
+            field: 'memberid',
+            label: t('query.other.institution_bank.memberid'),
+            placeholder: t('common.pleaseenter'),
+        },
+        {
+            field: 'accountstatus',
+            label: t('query.other.institution_bank.accountstatus'),
+            required: true,
+            placeholder: t('common.pleasechoice'),
+            options: () => getEnumOptions()
+        },
+        {
+            field: 'sortfield',
+            label: t('query.other.institution_bank.sortfield'),
+            required: true,
+            value: 0,
+            options: () => [
+                { label: t('query.other.institution_bank.nolimit'), value:  0 },
+                { label: t('query.other.institution_bank.currentbalance'), value: 1 },
+                { label: t('query.other.institution_bank.balance'), value: 2 },
+                { label: t('query.other.institution_bank.inamount'), value: 3 },
+                { label: t('query.other.institution_bank.outamount'), value: 4 },
+                { label: t('query.other.institution_bank.closepl'), value: 5 },
+                { label: t('query.other.institution_bank.paycharge'), value: 6 }
+            ]
+        },
+        {
+            field: 'sorttype',
+            value: 0,
+            options: () => [
+                { label: t('query.other.institution_bank.sorttype1'), value: 1 },
+                { label: t('query.other.institution_bank.sorttype2'), value: 0 }
+            ]
+        },
+    ],
+    buttons: [
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => onReset() }
+    ]
+})
+
+// 处理请求参数
+const processRequiredParams = () => {
+    const qs = getQueryParams()
+    return qs
+}
+
+const onSearch = () => {
+    const qs = processRequiredParams()
+    run(qs)
+}
+
+
+const onReset = () => {
+    dateValue.value = []
+    resetFilters()
+}
 </script>

src/packages/pc/views/query/other/investor_bank/index.vue

@@ -1,7 +1,172 @@
 <!-- 查询管理-其它查询-交易商资金查询 -->
 <template>
-    <app-view></app-view>
+    <app-view>
+        <template #header>
+            <app-filter :option="filterOption"  :rules="filterRules">
+                <template #accountid="{ item }">
+                    <el-form-item :label="item.label" prop="accountid">
+                        <app-select-account v-model="item.value" @change="onAccountChange" />
+                    </el-form-item>
+                </template>
+                <template #memberid="{ item }">
+                    <el-form-item :label="item.label" prop="memberid">
+                        <app-select-member v-model="item.value" usertype="2" :placeholder="t('investor.custom.group.edit.tips1')" />
+                    </el-form-item>
+                </template>
+            </app-filter>
+            <div class="report-account__info" v-if="selectedAccount">
+                <span>{{ t('report.account.accountid1') }}{{ selectedAccount.relatedname }}</span>
+                <span>{{ t('report.account.accountid') }}{{ selectedAccount.accountid }}</span>
+                <span>{{ t('report.account.invloginids') }}{{ selectedAccount.invloginids }}</span>
+            </div>
+        </template>
+        <app-table :data="dataList" :columns="tableColumns" :loading="loading">
+            <template #footer>
+                <app-pagination :total="total" v-model:page-size="pageSize" v-model:page-index="pageIndex"
+                    @change="onSearch" />
+            </template>
+        </app-table>
+        <component :is="componentMap.get(componentId)" v-bind="{ record, queryParams }" @closed="closeComponent"
+            v-if="componentId" />
+    </app-view>
 </template>
 
 <script lang="ts" setup>
+import { ref, shallowRef } from 'vue'
+import { ElMessage, FormRules } from 'element-plus'
+import { useDataFilter } from '@/hooks/datatable-v2'
+import { useRequest } from '@/hooks/request'
+import { useOperation } from '@/hooks/operation'
+import { queryinvestor } from '@/services/api/order'
+import { i18n } from '@/stores'
+import AppTable from '@pc/components/base/table/index.vue'
+import AppPagination from '@pc/components/base/pagination/index.vue'
+import AppFilter from '@pc/components/base/table-filter-v2/index.vue'
+import AppSelectAccount from '@pc/components/modules/select-account/index.vue'
+import AppSelectMember from '@pc/components/modules/select-member/index.vue'
+import { parsePercent } from '@/filters'
+
+const { global: { t } } = i18n
+const selectedAccount = shallowRef<Model.TAAccountChildrenSelectRsp>()
+
+const { componentMap, componentId, record, closeComponent } = useOperation<Model.investorReq>({
+    onClose: () => onSearch()
+})
+
+const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryinvestor, {
+    manual: true,
+    params: {
+        pageNum: 1,
+        pageSize: 20
+    },
+    onError: (err) => {
+        ElMessage.error(err)
+    }
+})
+
+const tableColumns = ref<Model.TableColumn[]>([
+    { field: 'accountid', label: 'query.other.investor_bank.accountid' },
+    { field: 'accountcodename', label: 'query.other.investor_bank.accountcodename' },
+    { field: 'balance', label: 'query.other.investor_bank.balance' },
+    { field: 'currentbalance', label: 'query.other.investor_bank.currentbalance' },
+    { field: 'inamount', label: 'query.other.investor_bank.inamount' },
+    { field: 'outamount', label: 'query.other.investor_bank.outamount' },
+    { field: 'closepl', label: 'query.other.investor_bank.closepl' },
+    { field: 'floatpl', label: 'query.other.investor_bank.floatpl' },
+    { field: 'freezecharge', label: 'query.other.investor_bank.freezecharge' },
+    { field: 'paycharge', label: 'query.other.investor_bank.paycharge' },
+    { field: 'otherpay', label: 'query.other.investor_bank.otherpay' },
+    { field: 'otherincome', label: 'query.other.investor_bank.otherincome' },
+    { field: 'freezemargin', label: 'query.other.investor_bank.freezemargin' },
+    { field: 'usedmargin', label: 'query.other.investor_bank.usedmargin' },
+    { field: 'otherfreezemargin', label: 'query.other.investor_bank.otherfreezemargin' },
+    { field: 'outamountfreeze', label: 'query.other.investor_bank.outamountfreeze' },
+    { field: 'avaiablemoney', label: 'query.other.investor_bank.avaiablemoney' },
+    { field: 'avaiableoutmoney', label: 'query.other.investor_bank.avaiableoutmoney' },
+    { field: 'floatnetvalue', label: 'query.other.investor_bank.floatnetvalue' },
+    { field: 'cur_risk_rate', label: 'query.other.investor_bank.cur_risk_rate', formatValue: (val) => parsePercent(val) },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
+])
+
+const onAccountChange = (item?: Model.TAAccountChildrenSelectRsp) => {
+    selectedAccount.value = item
+}
+
+// 表单验证规则
+const filterRules: FormRules = {
+    
+}
+
+const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.investorReq>({
+    filters: [
+        {
+            field: 'accountcode',
+            label: t('query.other.investor_bank.accountcode'),
+            placeholder: t('common.pleaseenter'),
+        },
+        {
+            field: 'memberid',
+            label: t('query.other.investor_bank.memberid'),
+            placeholder: t('common.pleaseenter'),
+        },
+        {
+            field: 'sortfield',
+            label: t('query.other.investor_bank.sortfield'),
+            required: true,
+            value: 0,
+            options: () => [
+                { label: t('query.other.investor_bank.nolimit'), value:  0 },
+                { label: t('query.other.investor_bank.balance'), value: 1 },
+                { label: t('query.other.investor_bank.balance'), value: 2 },
+                { label: t('query.other.investor_bank.inamount'), value: 3 },
+                { label: t('query.other.investor_bank.outamount'), value: 4 },
+                { label: t('query.other.investor_bank.closepl'), value: 5 },
+                { label: t('query.other.investor_bank.paycharge'), value: 6 }
+            ]
+        },
+        {
+            field: 'sorttype',
+            value: 0,
+            options: () => [
+                { label: t('query.other.investor_bank.sorttype1'), value: 1 },
+                { label: t('query.other.investor_bank.sorttype2'), value: 0 }
+            ]
+        },
+        {
+            field: 'accountid',
+            label: t('query.other.investor_bank.accountid'),
+            placeholder: t('common.pleaseenter'),
+        },
+        {
+            field: 'loginid',
+            label: t('query.other.investor_bank.loginid'),
+            placeholder: t('common.pleaseenter'),
+        },
+        {
+            field: 'parentarea',
+            label:  t('query.other.investor_bank.parentarea'),
+            placeholder: t('common.pleaseenter'),
+        },
+    ],
+    buttons: [
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => onReset() }
+    ]
+})
+
+// 处理请求参数
+const processRequiredParams = () => {
+    const qs = getQueryParams()
+    return qs
+}
+
+const onSearch = () => {
+    const qs = processRequiredParams()
+    run(qs)
+}
+
+
+const onReset = () => {
+    resetFilters()
+}
 </script>

src/services/api/account/index.ts

@@ -83,4 +83,11 @@ export function queryCommonFlag(options: CommonFetchOptions<{ request: Model.Com
  */
 export function inOrOutAmount(options: CommonFetchOptions<{ request: Model.inOrOutAmountReq; }>) {
     return httpClient.commonRequest('/taAccount/inOrOutAmount', 'post', options)
+}
+
+/**
+ * 内部订单查询--> 电子协议管理 --> 获取列表
+ */
+export function queryesignrecord(options: CommonFetchOptions<{ request: Model.SignRecordReq; response: Model.SignRecordRsp[] }>) {
+    return httpClient.commonRequest('/query/queryesignrecord', 'get', options)
 }

src/services/api/order/index.ts

@@ -382,4 +382,11 @@ export function queryOrderDate(options: CommonFetchOptions<{ request: Model.Orde
  */
 export function orderDateExport(options: CommonFetchOptions<{ request: Model.OrderDateReq; response: string; }>) {
     return httpClient.commonRequest('/queryOrder/orderDateExport', 'get', options)
+}
+
+/**
+ * 其他查询--> 交易商资金查询、机构资金查询--> 获取列表
+ */
+export function queryinvestor(options: CommonFetchOptions<{ request: Model.investorReq; response: Model.investorRsp[]; }>) {
+    return httpClient.commonRequest('/query/queryinvestor', 'get', options)
 }

src/types/model/bank.d.ts

@@ -164,4 +164,32 @@ declare namespace Model {
         currencyid: number;
         money: number;
     }
+
+    /** 内部订单查询->电子协议管理->获取列表 请求 */
+    interface SignRecordReq {
+        recordstatus?: number; // 签署状态
+        userid?: number; // 用户
+    }
+
+    /** 内部订单查询->电子协议管理->获取列表 响应 */
+    interface SignRecordRsp {
+        // 协议类型 esigntype
+        esigntype: number;
+        // 登录账号
+        loginid: number;
+        // 
+        recordid: number;
+        // 签署状态 esignrecordstatus
+        recordstatus: number;
+        //
+        sp1005Url: string;
+        //// 协议名称
+        templatename: string;
+        // 模板类型 esigntemplatetype
+        templatetype: number;
+        // 更新时间
+        updatetimestr: string;
+        // 用户
+        userfullname: string;
+    }
 }

src/types/model/order.d.ts

@@ -1878,4 +1878,75 @@ declare namespace Model {
         tradeid: string; // 订单号
         userfullname: string; // 客户
     }
+
+    /** 其他查询--> 交易商资金查询、机构资金查询--> 获取列表 */
+    interface investorReq {
+        accountcode?: number; // 交易商
+        accountid?: string; // 资金账户
+        accountstatus?: number; // 机构状态
+        areauserid?: number; // 
+        changeflag?: number; // 
+        loginid?: string; // 登录账号
+        memberid?: number; // 所属会员
+        orgztypes?: number; // 权限控制
+        pageNum: number; // 页码
+        pageSize: number; // 页大小
+        parentarea?: string; // 所属机构
+        roles?: string; // 机构角色
+        sortfield?: string // 排序
+        sorttype?: number; // 
+    }
+
+    /** 其他查询--> 交易商资金查询、机构资金查询--> 获取列表 */
+    interface investorRsp {
+        // 交易商
+        accountcodename: string
+        // 资金账户
+        accountid: number
+        // 可用资金
+        avaiablemoney: number
+        // 可出资金
+        avaiableoutmoney: number
+        // 期初余额
+        balance: number
+        // 转让损益
+        closepl: number
+        // 风险率(%)
+        cur_risk_rate: number
+        // 期末余额
+        currentbalance: number
+        // 当前净值
+        floatnetvalue: number
+        // 浮动损益
+        floatpl: number
+        // 冻结手续费
+        freezecharge: number
+        // 冻结保证金
+        freezemargin: number
+        // 今日入金
+        inamount: number
+        // 登录账号
+        invloginids: number
+        // 所属会员
+        membername: string
+        mortgagecredit: number
+        othercredit: number
+        // 其他冻结
+        otherfreezemargin: number
+        // 其它收入
+        otherincome: number
+        // 其它支出
+        otherpay: number
+        // 今日出金
+        outamount: number
+        // 出金冻结
+        outamountfreeze: number
+        outthreshold: number
+        // 所属机构
+        parentarea: string
+        // 手续费
+        paycharge: number
+        // 占用保证金
+        usedmargin: number
+    }
 }