update

oem/gstj/config/router.json

@@ -203,6 +203,13 @@
                         "title": "资金流水",
                         "code": "bottom_capital_statement",
                         "component": "views/footer/capital/statement/index.vue"
+                    },
+                    {
+                        "authType": 2,
+                        "sort": 3,
+                        "title": "出入金明细",
+                        "code": "bottom_capital_inoutapply",
+                        "component": "views/footer/capital/inoutapply/index.vue"
                     }
                 ]
             }

oem/qdhs/config/router.json

@@ -275,6 +275,13 @@
                         "title": "资金流水",
                         "code": "bottom_capital_statement",
                         "component": "views/footer/capital/statement/index.vue"
+                    },
+                    {
+                        "authType": 2,
+                        "sort": 3,
+                        "title": "出入金明细",
+                        "code": "bottom_capital_inoutapply",
+                        "component": "views/footer/capital/inoutapply/index.vue"
                     }
                 ]
             }

oem/qxst/config/appconfig.json

@@ -1,7 +1,7 @@
 {
   "appName": "贵州茶交数字化中心",
-  "version": "1.0.17",
-  "versionCode": "100017",
+  "version": "1.0.18",
+  "versionCode": "100018",
   "apiUrl": "http://192.168.31.204:8080/cfg?key=test_204",
   "tradeChannel": "ws",
   "modules": [

oem/qxst/config/router.json

@@ -82,133 +82,10 @@
             },
             {
                 "authType": 2,
-                "sort": 1,
-                "title": "商品订单",
-                "code": "bottom_goods",
-                "component": "views/footer/index.vue",
-                "hidden": true,
-                "children": []
-            },
-            {
-                "authType": 2,
-                "sort": 2,
-                "title": "预售转让",
-                "code": "bottom_presell",
-                "component": "views/footer/index.vue",
-                "hidden": true,
-                "children": [
-                    {
-                        "authType": 2,
-                        "sort": 1,
-                        "title": "预售认购",
-                        "code": "bottom_presell_presellposition",
-                        "component": "views/footer/presell/presellposition/index.vue",
-                        "children": []
-                    },
-                    {
-                        "authType": 2,
-                        "sort": 2,
-                        "title": "转让持仓",
-                        "code": "bottom_presell_transferposition",
-                        "component": "views/footer/presell/transferposition/index.vue",
-                        "children": []
-                    },
-                    {
-                        "authType": 2,
-                        "sort": 3,
-                        "title": "转让委托",
-                        "code": "bottom_presell_transferorder",
-                        "component": "views/footer/presell/transferorder/index.vue",
-                        "children": []
-                    },
-                    {
-                        "authType": 2,
-                        "sort": 4,
-                        "title": "转让成交",
-                        "code": "bottom_presell_transfertrader",
-                        "component": "views/footer/presell/transfertrader/index.vue",
-                        "children": []
-                    },
-                    {
-                        "authType": 2,
-                        "sort": 5,
-                        "title": "点选交收",
-                        "code": "bottom_presell_onlinedelivery",
-                        "component": "views/footer/presell/onlinedelivery/index.vue",
-                        "children": []
-                    }
-                ]
-            },
-            {
-                "authType": 2,
-                "sort": 3,
-                "title": "现货仓单",
-                "code": "bottom_spot",
-                "component": "views/footer/index.vue",
-                "hidden": true,
-                "children": [
-                    {
-                        "authType": 2,
-                        "sort": 1,
-                        "title": "现货明细",
-                        "code": "bottom_spot_position",
-                        "component": "views/footer/spot/position/index.vue"
-                    },
-                    {
-                        "authType": 2,
-                        "sort": 2,
-                        "title": "挂单",
-                        "code": "bottom_spot_order",
-                        "component": "views/footer/spot/order/index.vue"
-                    },
-                    {
-                        "authType": 2,
-                        "sort": 3,
-                        "title": "成交",
-                        "code": "bottom_spot_trade",
-                        "component": "views/footer/spot/trade/index.vue"
-                    },
-                    {
-                        "authType": 2,
-                        "sort": 4,
-                        "title": "提货",
-                        "code": "bottom_spot_pickup",
-                        "component": "views/footer/spot/pickup/index.vue"
-                    }
-                ]
-            },
-            {
-                "authType": 2,
-                "sort": 4,
-                "title": "履约信息",
-                "code": "bottom_performance",
-                "component": "views/footer/index.vue",
-                "hidden": true,
-                "children": [
-                    {
-                        "authType": 2,
-                        "sort": 1,
-                        "title": "买履约",
-                        "code": "bottom_performance_buy",
-                        "component": "views/footer/performance/buy/index.vue"
-                    },
-                    {
-                        "authType": 2,
-                        "sort": 2,
-                        "title": "卖履约",
-                        "code": "bottom_performance_sell",
-                        "component": "views/footer/performance/sell/index.vue"
-                    }
-                ]
-            },
-            {
-                "authType": 2,
-                "sort": 5,
-                "title": "资金信息",
-                "code": "bottom_capital",
-                "component": "views/footer/index.vue",
-                "hidden": true,
-                "children": []
+                "sort": 13,
+                "title": "出入金明细",
+                "code": "bottom_capital_inoutapply",
+                "component": "views/footer/capital/inoutapply/index.vue"
             }
         ]
     },

oem/tc/config/router.json

@@ -159,6 +159,13 @@
                         "title": "资金流水",
                         "code": "bottom_capital_statement",
                         "component": "views/footer/capital/statement/index.vue"
+                    },
+                    {
+                        "authType": 2,
+                        "sort": 13,
+                        "title": "出入金明细",
+                        "code": "bottom_capital_inoutapply",
+                        "component": "views/footer/capital/inoutapply/index.vue"
                     }
                 ]
             }

oem/zrwyt/config/router.json

@@ -197,6 +197,13 @@
                         "title": "资金流水",
                         "code": "bottom_capital_statement",
                         "component": "views/footer/capital/statement/index.vue"
+                    },
+                    {
+                        "authType": 2,
+                        "sort": 13,
+                        "title": "出入金明细",
+                        "code": "bottom_capital_inoutapply",
+                        "component": "views/footer/capital/inoutapply/index.vue"
                     }
                 ]
             }

src/packages/mobile/views/bank/wallet/components/inoutapply/Index.vue

@@ -14,20 +14,12 @@
                                 <h4>{{ formatDecimal(item.amount) }}</h4>
                             </div>
                             <div class="right">
-                                <span>{{ item.updatetime  }}</span>
+                                <span>{{ getInOutApplyStatusName(item.applystatus) }}</span>
                             </div>
                         </div>
                         <div class="g-order-list__content">
                             <ul>
-                                <li>
-                                    <span>申请类型</span>
-                                    <span>{{ getInOutExecuteTypeName(item.executetype) }}</span>
-                                </li>
-                                <li>
-                                    <span>申请状态</span>
-                                    <span>{{ getInOutApplyStatusName(item.applystatus) }}</span>
-                                </li>
-                                <li>
+                                <!-- <li>
                                     <span>姓名</span>
                                     <span>{{ item.accountname }}</span>
                                 </li>
@@ -42,15 +34,23 @@
                                 <li>
                                     <span>卡号</span>
                                     <span>{{ handleNoneValue(item.bankaccountno) }}</span>
-                                </li>
+                                </li> -->
                                 <li>
                                     <span>手续费</span>
                                     <span>{{ formatDecimal(item.charge) }}</span>
                                 </li>
                                 <li>
+                                    <span>类型</span>
+                                    <span>{{ getInOutExecuteTypeName(item.executetype) }}</span>
+                                </li>
+                                <li>
                                     <span>流水号</span>
                                     <span>{{ handleNoneValue(item.extoperateid) }}</span>
                                 </li>
+                                <li>
+                                    <span>时间</span>
+                                    <span>{{ formatDate(item.updatetime, 'MM/DD HH:mm:ss') }}</span>
+                                </li>
                             </ul>
                         </div>
                     </div>
@@ -67,7 +67,7 @@ import { queryAccountInOutApply } from '@/services/api/bank'
 import { getInOutApplyStatusName, getInOutExecuteTypeName } from '@/constants/order'
 import AppModal from '@/components/base/modal/index.vue'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
-import { formatDecimal, handleNoneValue } from '@/filters'
+import { formatDecimal, handleNoneValue, formatDate } from '@/filters'
 
 const showModal = shallowRef(true)
 const error = shallowRef(false)

src/packages/pc/views/footer/capital/statement/index.vue

@@ -1,21 +1,29 @@
 <!-- 资金信息-资金流水 -->
 <template>
-    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+    <app-table :data="tableList" v-model:columns="tableColumns" :loading="loading">
         <!-- 委托时间 -->
         <template #createtime="{ value }">
             {{ formatDate(value) }}
         </template>
+        <template #append>
+            <el-button size="small" plain @click="loadMore" v-if="showLoadMore">加载更多</el-button>
+        </template>
     </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
 import { formatDate } from '@/filters'
+import { useLocalPagination } from '@/hooks/pagination'
 import { useRequest } from '@/hooks/request'
 import { queryAmountLog } from '@/services/api/bank'
 import AppTable from '@pc/components/base/table/index.vue'
 
-const { loading, dataList } = useRequest(queryAmountLog, {})
+const { tableList, showLoadMore, initTableData, loadMore } = useLocalPagination<Model.AmountLogRsp>()
+
+const { loading } = useRequest(queryAmountLog, {
+    onSuccess: (res) => initTableData(res.data)
+})
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'accountid', label: '资金账号' },