xxxxx

src/mock/router.ts

@@ -135,14 +135,14 @@ const appmenu = {
                                 sort: 1,
                                 title: '买履约',
                                 code: 'bottom_performance_buy',
-                                component: 'views/footer/performance/list/index.vue',
+                                component: 'views/footer/performance/buy/index.vue',
                             },
                             {
                                 authType: 2,
                                 sort: 2,
                                 title: '卖履约',
                                 code: 'bottom_performance_sell',
-                                component: 'views/footer/performance/list/index.vue',
+                                component: 'views/footer/performance/sell/index.vue',
                             }
                         ]
                     },

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

@@ -1,12 +1,27 @@
 <!-- 资金信息-资金流水 -->
 <template>
-    <app-table :data="[]" v-model:columns="tableColumns" />
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <!-- 委托时间 -->
+        <template #createtime="{ value }">
+            {{ formatDate(value) }}
+        </template>
+    </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { formatDate } from '@/filters'
+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 tableColumns = shallowRef<Model.TableColumn[]>([
+    { prop: 'accountid', label: '资金账号' },
+    { prop: 'operatetypename', label: '资金类型' },
+    { prop: 'amount', label: '金额' },
+    { prop: 'currentbalance', label: '余额' },
+    { prop: 'createtime', label: '时间' }
 ])
 </script>

src/packages/pc/views/footer/goods/delivery/index.vue

@@ -1,12 +1,31 @@
-<!-- 商品订单-成交 -->
+<!-- 商品订单-交收 -->
 <template>
-    <app-table :data="[]" v-model:columns="tableColumns" />
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <!-- 申请时间 -->
+        <template #reqtime="{ value }">
+            {{ formatDate(value) }}
+        </template>
+    </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { useRequest } from '@/hooks/request'
+import { queryMineTradeGoodsDeliveryOfflines } from '@/services/api/transfer'
 import AppTable from '@pc/components/base/table/index.vue'
+import { formatDate } from '@/filters'
+
+const { loading, dataList } = useRequest(queryMineTradeGoodsDeliveryOfflines, {})
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
+    { prop: 'goodsnamedisplay', label: '订单合约' },
+    { prop: 'buyorselldisplay', label: '交收方向' },
+    { prop: 'deliveryqty', label: '交收数量' },
+    { prop: 'deliveryprice', label: '交收价格' },
+    { prop: 'deliveryamount', label: '交收金额' },
+    { prop: 'deliveryinfo', label: '交收信息' },
+    { prop: 'orderstatusdisplay', label: '状态' },
+    { prop: 'deliveryorderid', label: '交收单号' },
+    { prop: 'reqtime', label: '申请时间' }
 ])
 </script>

src/packages/pc/views/footer/goods/order/index.vue

@@ -1,12 +1,43 @@
-<!-- 商品订单-交收 -->
+<!-- 商品订单- 委托 -->
 <template>
-    <app-table :data="[]" v-model:columns="tableColumns" />
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <!-- 类型' -->
+        <template #buyorsell="{ value }">
+            {{ getBuyOrSellName(value) }}
+        </template>
+        <!-- 挂牌类型 -->
+        <template #orderstatus="{ value }">
+            {{ getWRTradeOrderStatusName(value) }}
+        </template>
+        <!-- 委托时间 -->
+        <template #ordertime="{ value }">
+            {{ formatDate(value) }}
+        </template>
+    </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { useRequest } from '@/hooks/request'
+import { getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
+import { queryTradeOrderDetail } from '@/services/api/order'
 import AppTable from '@pc/components/base/table/index.vue'
+import { formatDate } from '@/filters'
+
+const { loading, dataList } = useRequest(queryTradeOrderDetail, {
+    params: {
+        tradeMode: '50'
+    },
+})
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
+    { prop: 'goodsname', label: '订单合约' },
+    { prop: 'buyorsell', label: '类型' },
+    { prop: 'orderprice', label: '委托价' },
+    { prop: 'orderqty', label: '委托数量' },
+    { prop: 'tradeqty', label: '成交数量' },
+    { prop: 'orderid', label: '委托单号' },
+    { prop: 'ordertime', label: '委托时间' },
+    { prop: 'orderstatus', label: '状态' }
 ])
 </script>

src/packages/pc/views/footer/goods/position/index.vue

@@ -1,23 +1,37 @@
 <!-- 商品订单-合约汇总 -->
 <template>
-    <app-table :data="[]" v-model:columns="tableColumns" />
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <!-- 挂牌类型 -->
+        <template #buyorsell="{ value }">
+            {{ getBuyOrSellName(value) }}
+        </template>
+    </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { useRequest } from '@/hooks/request'
+import { getBuyOrSellName } from '@/constants/order'
+import { queryTradePosition } from '@/services/api/order'
 import AppTable from '@pc/components/base/table/index.vue'
 
+const { loading, dataList } = useRequest(queryTradePosition, {
+    params: {
+        tradeMode: '50'
+    },
+})
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
-    { prop: 'unknown', label: '订单合约' },
-    { prop: 'unknown', label: '方向' },
-    { prop: 'unknown', label: '持有数量' },
-    { prop: 'unknown', label: '可用数量' },
-    { prop: 'unknown', label: '冻结数量' },
-    { prop: 'unknown', label: '均价' },
+    { prop: 'goodsname', label: '订单合约' },
+    { prop: 'buyorsell', label: '方向' },
+    { prop: 'curpositionqty', label: '持有数量' },
+    { prop: 'enableqty', label: '可用数量' },
+    { prop: 'frozenqty', label: '冻结数量' },
+    { prop: 'averageprice', label: '均价' },
     { prop: 'unknown', label: '现价' },
-    { prop: 'unknown', label: '持仓金额' },
-    { prop: 'unknown', label: '占用保证金' },
-    { prop: 'unknown', label: '市值' },
+    { prop: 'curholderamount', label: '持仓金额' },
+    { prop: 'usedmargin', label: '占用保证金' },
+    { prop: 'marketamount', label: '市值' },
     { prop: 'unknown', label: '浮动盈亏' },
 ])
 </script>

src/packages/pc/views/footer/goods/trade/index.vue

@@ -1,12 +1,45 @@
-<!-- 商品订单-交收 -->
+<!-- 商品订单 - 成交 -->
 <template>
-    <app-table :data="[]" v-model:columns="tableColumns" />
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <!-- 类型' -->
+        <template #buyorsell="{ value }">
+            {{ getBuyOrSellName(value) }}
+        </template>
+        <!-- 成交类型 -->
+        <template #buildtype="{ value }">
+            {{ getBuildTypeName(value) }}
+        </template>
+        <!-- 成交时间 -->
+        <template #tradetime="{ value }">
+            {{ formatDate(value) }}
+        </template>
+    </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { useRequest } from '@/hooks/request'
+import { getBuyOrSellName, getBuildTypeName } from '@/constants/order'
+import { queryTradeDetail } from '@/services/api/order'
 import AppTable from '@pc/components/base/table/index.vue'
+import { formatDate } from '@/filters'
+
+const { loading, dataList } = useRequest(queryTradeDetail, {
+    params: {
+        tradeMode: '50'
+    },
+})
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
+    { prop: 'goodsname', label: '订单合约' },
+    { prop: 'buyorsell', label: '方向' },
+    { prop: 'buildtype', label: '成交类型' },
+    { prop: 'tradeprice', label: '成交价格' },
+    { prop: 'tradeqty', label: '成交数量' },
+    { prop: 'charge', label: '手续费' },
+    { prop: 'closepl', label: '平仓盈亏' },
+    { prop: 'tradeid', label: '成交单号' },
+    { prop: 'matchaccountid', label: '成交对手' },
+    { prop: 'tradetime', label: '成交时间' }
 ])
 </script>

src/packages/pc/views/footer/performance/buy/index.vue

@@ -0,0 +1,55 @@
+<!-- 资金流水-卖履约-执行中 -->
+<template>
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+         <!-- 履约状态 -->
+         <template #performancestatus="{ value }">
+            {{ getPerformanceStatusName(value) }}
+        </template>
+        <!-- 履约类型 -->
+        <template #performancetype="{ value }">
+            {{ getPerformanceTypeName(value) }}
+        </template>
+        <!-- 履约类型 -->
+        <template #paymenttype="{ value }">
+            {{ getPaymentTypeName(value) }}
+        </template>
+        <!-- 委托时间 -->
+        <template #starttime="{ value }">
+            {{ formatDate(value) }}
+        </template>
+    </app-table>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef } from 'vue'
+import { formatDate } from '@/filters'
+import { useRequest } from '@/hooks/request'
+import { queryPerformancePlan } from '@/services/api/performance'
+import { BuyOrSell, getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/constants/order'
+import AppTable from '@pc/components/base/table/index.vue'
+
+const { loading, dataList } = useRequest(queryPerformancePlan, {
+    params: {
+        buyorsell: BuyOrSell.Sell,
+        status:'2'
+    },
+})
+
+const tableColumns = shallowRef<Model.TableColumn[]>([
+    { prop: 'deliverygoodsname', label: '品种' },
+    { prop: 'wrstandardname', label: '商品' },
+    { prop: 'performancetype', label: '类型' },
+    { prop: 'relatedorderid', label: '关联单号' },
+    { prop: 'paymenttype', label: '付款方式' },
+    { prop: 'sellerfreezeamount', label: '履约冻结' },
+    { prop: 'sellerfreezeamountremain', label: '履约冻结剩余' },
+    { prop: 'amount', label: '总金额' },
+    { prop: 'sellreceivedamount', label: '已收金额' },
+    { prop: 'overshortamount', label: '溢短金额' },
+    { prop: 'buyusername', label: '买方' },
+    { prop: 'performancestatus', label: '履约状态' },
+    { prop: 'curstepname', label: '当前步骤' },
+    { prop: 'starttime', label: '开始时间' },
+    
+])
+</script>

src/packages/pc/views/footer/performance/list/index.vue

@@ -1,12 +0,0 @@
-<!-- 履约信息 -->
-<template>
-    <app-table :data="[]" v-model:columns="tableColumns" />
-</template>
-
-<script lang="ts" setup>
-import { shallowRef } from 'vue'
-import AppTable from '@pc/components/base/table/index.vue'
-
-const tableColumns = shallowRef<Model.TableColumn[]>([
-])
-</script>

src/packages/pc/views/footer/performance/sell/index.vue

@@ -0,0 +1,55 @@
+<!-- 底部-履约信息-卖履约 -->
+<template>
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+         <!-- 履约状态 -->
+         <template #performancestatus="{ value }">
+            {{ getPerformanceStatusName(value) }}
+        </template>
+        <!-- 履约类型 -->
+        <template #performancetype="{ value }">
+            {{ getPerformanceTypeName(value) }}
+        </template>
+        <!-- 履约类型 -->
+        <template #paymenttype="{ value }">
+            {{ getPaymentTypeName(value) }}
+        </template>
+        <!-- 委托时间 -->
+        <template #starttime="{ value }">
+            {{ formatDate(value) }}
+        </template>
+    </app-table>
+</template>
+
+<script lang="ts" setup>
+import { shallowRef } from 'vue'
+import { formatDate } from '@/filters'
+import { useRequest } from '@/hooks/request'
+import { queryPerformancePlan } from '@/services/api/performance'
+import { BuyOrSell, getPaymentTypeName, getPerformanceStatusName, getPerformanceTypeName } from '@/constants/order'
+import AppTable from '@pc/components/base/table/index.vue'
+
+const { loading, dataList } = useRequest(queryPerformancePlan, {
+    params: {
+        buyorsell: BuyOrSell.Sell,
+        status:'2'
+    },
+})
+
+const tableColumns = shallowRef<Model.TableColumn[]>([
+    { prop: 'deliverygoodsname', label: '品种' },
+    { prop: 'wrstandardname', label: '商品' },
+    { prop: 'performancetype', label: '类型' },
+    { prop: 'relatedorderid', label: '关联单号' },
+    { prop: 'paymenttype', label: '付款方式' },
+    { prop: 'sellerfreezeamount', label: '履约冻结' },
+    { prop: 'sellerfreezeamountremain', label: '履约冻结剩余' },
+    { prop: 'amount', label: '总金额' },
+    { prop: 'sellreceivedamount', label: '已收金额' },
+    { prop: 'overshortamount', label: '溢短金额' },
+    { prop: 'buyusername', label: '买方' },
+    { prop: 'performancestatus', label: '履约状态' },
+    { prop: 'curstepname', label: '当前步骤' },
+    { prop: 'starttime', label: '开始时间' },
+    
+])
+</script>

src/packages/pc/views/footer/spot/order/index.vue

@@ -1,12 +1,53 @@
 <!-- 现货仓单-挂单 -->
 <template>
-    <app-table :data="[]" v-model:columns="tableColumns" />
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <!-- 挂牌类型 -->
+        <template #wrtradetype="{ value }">
+            {{ getWrTradeTypeName(value) }}
+        </template>
+        <!-- 委托状态 -->
+        <template #wrtradeorderstatus="{ value }">
+            {{ getWRTradeOrderStatusName(value) }}
+        </template>
+         <!-- 挂牌方式 -->
+         <template #wrpricetype="{ value }">
+            {{ getWrPriceTypeName(value) }}
+        </template>
+        <!-- 过户时间 -->
+        <template #ordertime="{ value }">
+            {{ formatDate(value) }}
+        </template>
+    </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { formatDate } from '@/filters'
+import { useRequest } from '@/hooks/request'
+import { queryWrOrderDetail } from '@/services/api/order'
+import { getWrTradeTypeName, getWRTradeOrderStatusName, getWrPriceTypeName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 
+const { loading, dataList } = useRequest(queryWrOrderDetail, {
+    params: {
+        wrtradetype: 1,
+        marketid: 17201,
+        haswr: 1
+    },
+})
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
+    { prop: 'wrtradeorderid', label: '挂牌单号' },
+    { prop: 'wrtradetype', label: '挂牌类型' },
+    { prop: 'wrtradeorderstatus', label: '委托状态' },
+    { prop: 'deliverygoodsname', label: '品种' },
+    { prop: 'wrstandardname', label: '商品' },
+    { prop: 'warehousename', label: '仓库' },
+    { prop: 'wrpricetype', label: '挂牌方式' },
+    { prop: 'goodsname', label: '期货合约' },
+    { prop: 'fixedprice', label: '价格/基差' },
+    { prop: 'orderqty', label: '挂牌数量' },
+    { prop: 'tradeqty', label: '成交数量' },
+    { prop: 'ordertime', label: '挂牌时间' }
 ])
 </script>

src/packages/pc/views/footer/spot/pickup/index.vue

@@ -1,12 +1,35 @@
 <!-- 现货仓单-提货 -->
 <template>
-    <app-table :data="[]" v-model:columns="tableColumns" />
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <!-- 状态 -->
+        <template #applystatus="{ value }">
+            {{ getApplyStatusName(value) }}
+        </template>
+        <!-- 成交时间 -->
+        <template #applytime="{ value }">
+            {{ formatDate(value) }}
+        </template>
+    </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { formatDate } from '@/filters'
+import { useRequest } from '@/hooks/request'
+import { queryWrOutInApply } from '@/services/api/order'
+import { getApplyStatusName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 
+const { loading, dataList } = useRequest(queryWrOutInApply, {})
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
+    { prop: 'deliverygoodsname', label: '品种' },
+    { prop: 'wrstandardname', label: '商品' },
+    { prop: 'warehousename', label: '仓库' },
+    { prop: 'appointmentmodeldisplay', label: '类型' },
+    { prop: 'qty', label: '数量' },
+    { prop: 'applytime', label: '时间' },
+    { prop: 'expressnum', label: '物流信息' },
+    { prop: 'applystatus', label: '状态' }
 ])
 </script>

src/packages/pc/views/footer/spot/position/index.vue

@@ -1,12 +1,31 @@
 <!-- 现货仓单-现货明细 -->
 <template>
-    <app-table :data="[]" v-model:columns="tableColumns" />
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <!-- 过户时间 -->
+        <template #createtime="{ value }">
+            {{ formatDate(value) }}
+        </template>
+    </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { formatDate } from '@/filters'
+import { useRequest } from '@/hooks/request'
+import { queryHoldLB } from '@/services/api/order'
 import AppTable from '@pc/components/base/table/index.vue'
 
+const { loading, dataList } = useRequest(queryHoldLB, {})
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
+    { prop: 'wrholdeno', label: '仓单编号' },
+    { prop: 'deliverygoodsname', label: '品种' },
+    { prop: 'wrstandardname', label: '商品' },
+    { prop: 'warehousename', label: '仓库' },
+    { prop: 'qty', label: '库存数量' },
+    { prop: 'freezerqty', label: '冻结数量' },
+    { prop: 'pledgeqty', label: '质押数量' },
+    { prop: 'enableqty', label: '可用数量' },
+    { prop: 'createtime', label: '过户时间' }
 ])
 </script>

src/packages/pc/views/footer/spot/trade/index.vue

@@ -1,12 +1,47 @@
 <!-- 现货仓单-成交 -->
 <template>
-    <app-table :data="[]" v-model:columns="tableColumns" />
+    <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+        <!-- 挂牌类型 -->
+        <template #wrtradetype="{ value }">
+            {{ getWrTradeTypeName(value) }}
+        </template>
+        <!-- 成交金额 -->
+        <template #tradeamount="{ row }">
+            {{ formatDecimal(row.tradeqty*row.tradeprice) }}
+        </template>
+        <!-- 成交时间 -->
+        <template #tradetime="{ value }">
+            {{ formatDate(value) }}
+        </template>
+    </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
+import { formatDate, formatDecimal } from '@/filters'
+import { useRequest } from '@/hooks/request'
+import { queryWrTradeDetail } from '@/services/api/order'
+import { getWrTradeTypeName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 
+const { loading, dataList } = useRequest(queryWrTradeDetail, {
+    params: {
+        marketid: 17201,
+        haswr: 1
+    },
+})
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
+    { prop: 'wrtradedetailid', label: '成交单号' },
+    { prop: 'wrtradetype', label: '类型' },
+    { prop: 'deliverygoodsname', label: '品种' },
+    { prop: 'wrstandardname', label: '商品' },
+    { prop: 'warehousename', label: '仓库' },
+    { prop: 'tradeprice', label: '成交价格' },
+    { prop: 'tradeqty', label: '成交数量' },
+    { prop: 'tradeamount', label: '成交金额 ' },
+    { prop: 'chargevalue', label: '手续费' },
+    { prop: 'matchusername', label: '对手方' },
+    { prop: 'tradetime', label: '成交时间' }
 ])
 </script>