update

src/packages/pc/views/account/fundacct/components/bankinout/index.vue

@@ -97,7 +97,7 @@ const refresh = shallowRef(false)
 const loading = shallowRef(false)
 const selectedBank = shallowRef<Model.BankAccountSignRsp>()
 
-const formData = reactive<Model.inOrOutAmountReq>({
+const formData = reactive<Model.InOrOutAmountReq>({
     accountcode: props.record.accountId,
     accpwd: '',
     cusbankid: '',

src/packages/pc/views/member/subinstitution/addition/index.vue

@@ -1,7 +1,98 @@
 <!-- 会员机构管理-子机构管理-子机构变更审核 -->
 <template>
-    <app-view></app-view>
+    <app-view>
+        <template #header>
+            <app-filter :option="filterOption" />
+        </template>
+        <app-table :data="dataList" :columns="tableColumns" :loading="loading">
+            <!-- 操作 -->
+            <template #operate="{ row }">
+                <app-operation size="small" :data-list="getActionButtons()"
+                    @click="(code: string) => openComponent(code, row)" circle />
+            </template>
+            <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 }" @closed="closeComponent"
+            v-if="componentId" />
+    </app-view>
 </template>
 
 <script lang="ts" setup>
+import { shallowRef } from 'vue'
+import { ElMessage } from 'element-plus'
+import { formatDate } from '@/filters'
+import { getUserInfoTypeName } from '@/constants/member'
+import { useEnum } from '@/hooks/enum'
+import { useRequest } from '@/hooks/request'
+import { useDataFilter } from '@/hooks/datatable-v2'
+import { useOperation } from '@/hooks/operation'
+import { queryOrganSonAudit } from '@/services/api/member'
+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 areastatusEnum = useEnum('areastatus')
+// 机构类型
+const usertype2Enum = useEnum('usertype2')
+// 类型
+const subarealevelEnum = useEnum('subarealevel')
+
+const { componentMap, componentId, record, openComponent, closeComponent, getActionButtons } = useOperation<Model.OrganSonRsp>({
+    onClose: () => onSearch()
+})
+
+const { dataList, total, pageSize, pageIndex, loading, run } = useRequest(queryOrganSonAudit, {
+    params: {
+        pageNum: 1,
+        pageSize: 20,
+        accountstatus: 2
+    },
+    onError: (err) => {
+        ElMessage.error(err)
+    }
+})
+
+const tableColumns = shallowRef<Model.TableColumn[]>([
+    { field: 'userid', label: '机构代码' },
+    { field: 'accountname', label: '机构名称' },
+    { field: 'parentname', label: '所属机构' },
+    { field: 'memberusername', label: '所属会员' },
+    { field: 'accountstatus', label: '机构状态', formatValue: (val) => areastatusEnum.getEnumTypeName(val) },
+    { field: 'usertype', label: '机构类型', formatValue: (val) => usertype2Enum.getEnumTypeName(val) },
+    { field: 'userinfotype', label: '所有者类型', formatValue: (val) => getUserInfoTypeName(val) },
+    { field: 'userName', label: '操作员' },
+    { field: 'modifytime', label: '最后更新时间', formatValue: (val) => formatDate(val) },
+    { field: 'operate', label: 'common.operate', fixed: 'right' }
+])
+
+const { filterOption, getQueryParams, resetFilters } = useDataFilter<Model.OrganSonAuditReq>({
+    filters: [
+        {
+            field: 'accountname',
+            label: '机构'
+        },
+        {
+            field: 'subarealevel',
+            label: '类型',
+            options: () => subarealevelEnum.getEnumOptions()
+        }
+    ],
+    buttons: [
+        { label: t('operation.search'), className: 'el-button--primary', onClick: () => onSearch() },
+        { label: t('operation.reset'), className: 'el-button--primary', validateEvent: false, onClick: () => resetFilters() }
+    ]
+})
+
+const onSearch = (clear = false) => {
+    const qs = getQueryParams(clear)
+    run(qs)
+}
 </script>

src/packages/pc/views/member/subinstitution/manage/components/details/index.vue

@@ -211,8 +211,8 @@ const { global: { t } } = i18n
 const show = ref(true)
 const refresh = ref(false)
 const loading = ref(false)
-const newData = ref<Model.organSonViewsonRsp['newResult']>()
-const oldData = ref<Model.organSonViewsonRsp['oldResult']>()
+const newData = ref<Model.OrganSonViewsonRsp['newResult']>()
+const oldData = ref<Model.OrganSonViewsonRsp['oldResult']>()
 
 // 机构状态
 const areastatusEnum = useEnum('areastatus')

src/packages/pc/views/member/subinstitution/manage/components/edit/index.vue

@@ -215,7 +215,7 @@ const uploadFiles = reactive<{
 // 是否个人
 const isPerson = computed(() => formData.value.userinfotype === UserInfoType.Personal)
 
-const formData = ref<Partial<Model.organSonUpdateReq>>({
+const formData = ref<Partial<Model.OrganSonUpdateReq>>({
     parentuserid: props.selectedParent?.userid,
     userinfotype: UserInfoType.Company,
     sex: Gender.Male,

src/packages/pc/views/query/internal/offlinedelivery/components/cancel/index.vue

@@ -38,7 +38,7 @@ const refresh = shallowRef(false)
 const loading = shallowRef(false)
 const inputRef = shallowRef<InputInstance>()
 
-const formData = reactive<Model.offlineFailReq>({
+const formData = reactive<Model.OfflineFailReq>({
     auditremark: '',
     deliveryorderid: props.record.deliveryorderid,
     marketid: props.record.marketid

src/packages/pc/views/query/order/delivery/components/cancel/index.vue

@@ -38,7 +38,7 @@ const refresh = shallowRef(false)
 const loading = shallowRef(false)
 const inputRef = shallowRef<InputInstance>()
 
-const formData = reactive<Model.offlineFailReq>({
+const formData = reactive<Model.OfflineFailReq>({
     auditremark: '',
     deliveryorderid: props.record.deliveryorderid,
     marketid: props.record.marketid

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

@@ -42,7 +42,7 @@ const dateValue = shallowRef<string[] | null>([])
 
 const { getEnumOptions } = useEnum('accountstatus') // 业务类型
 
-const { componentMap, componentId, record, closeComponent } = useOperation<Model.investorReq>({
+const { componentMap, componentId, record, closeComponent } = useOperation<Model.InvestorReq>({
     onClose: () => onSearch()
 })
 
@@ -91,7 +91,7 @@ const filterRules: FormRules = {
     }]
 }
 
-const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.investorReq>({
+const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.InvestorReq>({
     filters: [
         {
             field: 'memberid',

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

@@ -50,7 +50,7 @@ import { parsePercent } from '@/filters'
 const { global: { t } } = i18n
 const selectedAccount = shallowRef<Model.TAAccountChildrenSelectRsp>()
 
-const { componentMap, componentId, record, closeComponent } = useOperation<Model.investorReq>({
+const { componentMap, componentId, record, closeComponent } = useOperation<Model.InvestorReq>({
     onClose: () => onSearch()
 })
 
@@ -98,7 +98,7 @@ const filterRules: FormRules = {
 
 }
 
-const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.investorReq>({
+const { queryParams, filterOption, getQueryParams, resetFilters } = useDataFilter<Model.InvestorReq>({
     filters: [
         {
             field: 'accountcode',

src/services/api/account/index.ts

@@ -81,7 +81,7 @@ export function queryCommonFlag(options: CommonFetchOptions<{ request: Model.Com
 /**
  * 网上出入金申请
  */
-export function inOrOutAmount(options: CommonFetchOptions<{ request: Model.inOrOutAmountReq; }>) {
+export function inOrOutAmount(options: CommonFetchOptions<{ request: Model.InOrOutAmountReq; }>) {
     return httpClient.commonRequest('/taAccount/inOrOutAmount', 'post', options)
 }
 

src/services/api/member/index.ts

@@ -53,28 +53,28 @@ export function getAreaAndAllChilds(options: CommonFetchOptions<{ response: Mode
 /**
  * 会员机构管理-->子机构管理-->新增
  */
-export function organSonAdd(options: CommonFetchOptions<{ request: Partial<Model.organSonUpdateReq>; }>) {
+export function organSonAdd(options: CommonFetchOptions<{ request: Partial<Model.OrganSonUpdateReq>; }>) {
     return httpClient.commonRequest('/organSon/addsonorgan', 'post', options)
 }
 
 /**
  * 会员机构管理-->子机构管理-->保存
  */
-export function organSonSave(options: CommonFetchOptions<{ request: Partial<Model.organSonUpdateReq>; }>) {
+export function organSonSave(options: CommonFetchOptions<{ request: Partial<Model.OrganSonUpdateReq>; }>) {
     return httpClient.commonRequest('/organSon/edit', 'post', options)
 }
 
 /**
  * 会员机构管理-->子机构管理-->修改
  */
-export function organSonEdit(options: CommonFetchOptions<{ request: Partial<Model.organSonUpdateReq>; }>) {
+export function organSonEdit(options: CommonFetchOptions<{ request: Partial<Model.OrganSonUpdateReq>; }>) {
     return httpClient.commonRequest('/organSon/editsonorgan', 'post', options)
 }
 
 /**
  * 会员机构管理-->子机构管理-->注销
  */
-export function organSonDelete(options: CommonFetchOptions<{ request: Model.organSonDeleteReq; }>) {
+export function organSonDelete(options: CommonFetchOptions<{ request: Model.OrganSonDeleteReq; }>) {
     return httpClient.commonRequest('/organSon/delete', 'get', options)
 }
 
@@ -88,21 +88,21 @@ export function queryOrganSon(options: CommonFetchOptions<{ request: Model.Organ
 /**
  * 会员机构管理-->子机构管理-->撤回
  */
-export function organSonRebackChange(options: CommonFetchOptions<{ request: Model.organSonRebackChangeReq; }>) {
+export function organSonRebackChange(options: CommonFetchOptions<{ request: Model.OrganSonRebackChangeReq; }>) {
     return httpClient.commonRequest('/organSon/rebackChange', 'get', options)
 }
 
 /**
  * 会员机构管理-->子机构管理-->恢复
  */
-export function organSonRecover(options: CommonFetchOptions<{ request: Model.organSonRecoverReq; }>) {
+export function organSonRecover(options: CommonFetchOptions<{ request: Model.OrganSonRecoverReq; }>) {
     return httpClient.commonRequest('/organSon/recover', 'get', options)
 }
 
 /**
  * 会员机构管理-->子机构管理-->机构详情
  */
-export function organSonViewson(options: CommonFetchOptions<{ request: Model.organSonViewsonReq; response: Model.organSonViewsonRsp; }>) {
+export function organSonViewson(options: CommonFetchOptions<{ request: Model.OrganSonViewsonReq; response: Model.OrganSonViewsonRsp; }>) {
     return httpClient.commonRequest('/organSon/viewson', 'get', options)
 }
 
@@ -293,4 +293,11 @@ export function selfsupportresetPwd(options: CommonFetchOptions<{ request: Model
  */
 export function selfSupportLock(options: CommonFetchOptions<{ request: Model.SelfSupportLockReq; }>) {
     return httpClient.commonRequest('/organDetail/lockAccount', 'get', options)
+}
+
+/**
+ * 会员机构管理-->子机构管理-->新增子机构审核-->获取机构列表
+ */
+export function queryOrganSonAudit(options: CommonFetchOptions<{ request: Model.OrganSonAuditReq; response: Model.OrganSonRsp[]; }>) {
+    return httpClient.commonRequest('/organSon/queryaudit', 'get', options)
 }

src/services/api/order/index.ts

@@ -261,21 +261,21 @@ export function offlineExport(options: CommonFetchOptions<{ request: Model.Offli
 /**
  * 内部订单查询--> 线下交收单查询 --> 确认交收
  */
-export function offlineClose(options: CommonFetchOptions<{ request: Model.offlineCloseReq; }>) {
+export function offlineClose(options: CommonFetchOptions<{ request: Model.OfflineCloseReq; }>) {
     return httpClient.commonRequest('/query/offlineclose', 'get', options)
 }
 
 /**
  * 内部订单查询--> 线下交收单查询 --> 交收失败
  */
-export function offlineFail(options: CommonFetchOptions<{ request: Model.offlineFailReq; }>) {
+export function offlineFail(options: CommonFetchOptions<{ request: Model.OfflineFailReq; }>) {
     return httpClient.commonRequest('/query/offlinefail', 'get', options)
 }
 
 /**
  * 内部订单查询--> 线下交收单查询 --> 交收付款
  */
-export function sellGoods(options: CommonFetchOptions<{ request: Model.sellGoodsReq; }>) {
+export function sellGoods(options: CommonFetchOptions<{ request: Model.SellGoodsReq; }>) {
     return httpClient.commonRequest('/query/sellGoods', 'get', options)
 }
 
@@ -289,7 +289,7 @@ export function monitorddjk(options: CommonFetchOptions<{ request: Model.Monitor
 /**
  * 订单管理--> 订单监控 --> 获取总数居
  */
-export function monitorddjkCount(options: CommonFetchOptions<{ request: Omit<Model.MonitorddjkReq, 'pageNum' | 'pageSize'>; response: Model.monitorddjkCountRsp; }>) {
+export function monitorddjkCount(options: CommonFetchOptions<{ request: Omit<Model.MonitorddjkReq, 'pageNum' | 'pageSize'>; response: Model.MonitorddjkCountRsp; }>) {
     return httpClient.commonRequest('/queryOrder/monitorddjkCount', 'get', options)
 }
 
@@ -387,6 +387,6 @@ export function orderDateExport(options: CommonFetchOptions<{ request: Model.Ord
 /**
  * 其他查询--> 交易商资金查询、机构资金查询--> 获取列表
  */
-export function queryinvestor(options: CommonFetchOptions<{ request: Model.investorReq; response: Model.investorRsp[]; }>) {
+export function queryinvestor(options: CommonFetchOptions<{ request: Model.InvestorReq; response: Model.InvestorRsp[]; }>) {
     return httpClient.commonRequest('/query/queryinvestor', 'get', options)
 }

src/types/model/bank.d.ts

@@ -77,7 +77,7 @@ declare namespace Model {
     }
 
     /** 网上出入金申请 请求 */
-    interface inOrOutAmountReq {
+    interface InOrOutAmountReq {
         accountcode: number; // 资金账户
         accpwd: string; // 资金密码
         cusbankid: string; // 托管银行

src/types/model/member.d.ts

@@ -173,7 +173,7 @@ declare namespace Model {
     }
 
     /** 会员机构管理-->子机构管理-->新增 请求 */
-    interface organSonUpdateReq {
+    interface OrganSonUpdateReq {
         accountname: string; // 机构名称
         address: string; // 地址
         attachment1: string; // 附件1
@@ -211,7 +211,7 @@ declare namespace Model {
     }
 
     /** 会员机构管理-->子机构管理-->注销 请求 */
-    interface organSonDeleteReq {
+    interface OrganSonDeleteReq {
         areaid: number;
     }
 
@@ -286,23 +286,23 @@ declare namespace Model {
     }
 
     /** 会员机构管理-->子机构管理-->撤回 请求 */
-    interface organSonRebackChangeReq {
+    interface OrganSonRebackChangeReq {
         areaid: number;
     }
 
     /** 会员机构管理-->子机构管理-->恢复 请求 */
-    interface organSonRecoverReq {
+    interface OrganSonRecoverReq {
         areaid: number;
     }
 
     /** 会员机构管理-->子机构管理-->机构详情 请求 */
-    interface organSonViewsonReq {
+    interface OrganSonViewsonReq {
         areaid: number;
         modifystatus?: number;
     }
 
     /** 会员机构管理-->子机构管理-->机构详情 响应 */
-    interface organSonViewsonRsp {
+    interface OrganSonViewsonRsp {
         logincode: string;
         mobileUrl: string;
         newResult: {
@@ -1709,4 +1709,20 @@ declare namespace Model {
         loginid: number;
         status: number;
     }
+
+    /** 会员机构管理-->子机构管理-->新增子机构审核-->获取机构列表 请求 */
+    interface OrganSonAuditReq {
+        accountname?: string; // 机构
+        accountstatus?: number; // 机构状态
+        endtime?: string; // 结束时间
+        markets?: number; // 市场权限
+        memberuserid?: number; // 一级机构代码
+        pageNum: number;
+        pageSize: number;
+        parentuserid?: number;
+        roles?: string; // 角色
+        starttime?: string; // 开始时间
+        subarealevel?: number; // 类型
+        usertype?: number;
+    }
 }

src/types/model/order.d.ts

@@ -1521,20 +1521,20 @@ declare namespace Model {
     }
 
     /** 内部订单查询--> 线下交收单查询 --> 确认交收 请求 */
-    interface offlineCloseReq {
+    interface OfflineCloseReq {
         deliveryorderid: string;
         marketid: number;
     }
 
     /** 内部订单查询--> 线下交收单查询 --> 确认交收 请求 */
-    interface offlineFailReq {
+    interface OfflineFailReq {
         auditremark: string;
         deliveryorderid: string;
         marketid: number;
     }
 
     /** 内部订单查询--> 线下交收单查询 --> 交收付款 请求 */
-    interface sellGoodsReq {
+    interface SellGoodsReq {
         deliveryorderid: string;
         marketid: number;
     }
@@ -1591,7 +1591,7 @@ declare namespace Model {
     }
 
     /** 订单管理--> 订单监控 --> 获取总数居 响应 */
-    interface monitorddjkCountRsp {
+    interface MonitorddjkCountRsp {
         avgholderprice: string; // 订单均价
         buyBackCount: number; // 买总数量
         floatpl: number; // 总浮动结余
@@ -1880,7 +1880,7 @@ declare namespace Model {
     }
 
     /** 其他查询--> 交易商资金查询、机构资金查询--> 获取列表 */
-    interface investorReq {
+    interface InvestorReq {
         accountcode?: number; // 交易商
         accountid?: string; // 资金账户
         accountstatus?: number; // 机构状态
@@ -1898,7 +1898,7 @@ declare namespace Model {
     }
 
     /** 其他查询--> 交易商资金查询、机构资金查询--> 获取列表 */
-    interface investorRsp {
+    interface InvestorRsp {
         // 交易商
         accountcodename: string
         // 资金账户