xxxx

public/config/router.json

@@ -296,33 +296,8 @@
                     },
                     {
                         "authType": 1,
-                        "sort": 2,
-                        "title": "现货仓单",
-                        "code": "query_order_spot",
-                        "url": "spot",
-                        "urlType": 1,
-                        "component": "views/query/order/spot/index.vue",
-                        "children": [
-                            {
-                                "authType": 2,
-                                "sort": 1,
-                                "title": "当前记录",
-                                "code": "query_order_spot_list",
-                                "component": "views/query/order/spot/list/index.vue"
-                            },
-                            {
-                                "authType": 2,
-                                "sort": 2,
-                                "title": "历史记录",
-                                "code": "query_order_spot_history",
-                                "component": "views/query/order/spot/history/index.vue"
-                            }
-                        ]
-                    },
-                    {
-                        "authType": 1,
                         "sort": 3,
-                        "title": "仓单预售",
+                        "title": "预售转让",
                         "code": "query_order_presell",
                         "url": "spot",
                         "urlType": 1,
@@ -357,6 +332,31 @@
                                 "component": "views/query/order/presell/transferhistory/index.vue"
                             }
                         ]
+                    },
+                    {
+                        "authType": 1,
+                        "sort": 2,
+                        "title": "现货仓单",
+                        "code": "query_order_spot",
+                        "url": "spot",
+                        "urlType": 1,
+                        "component": "views/query/order/spot/index.vue",
+                        "children": [
+                            {
+                                "authType": 2,
+                                "sort": 1,
+                                "title": "当前记录",
+                                "code": "query_order_spot_list",
+                                "component": "views/query/order/spot/list/index.vue"
+                            },
+                            {
+                                "authType": 2,
+                                "sort": 2,
+                                "title": "历史记录",
+                                "code": "query_order_spot_history",
+                                "component": "views/query/order/spot/history/index.vue"
+                            }
+                        ]
                     }
                 ]
             },
@@ -397,50 +397,50 @@
                     {
                         "authType": 1,
                         "sort": 2,
-                        "title": "现货仓单",
-                        "code": "query_trade_spot",
+                        "title": "预售转让",
+                        "code": "query_trade_presell",
                         "url": "spot",
                         "urlType": 1,
-                        "component": "views/query/trade/spot/index.vue",
+                        "component": "views/query/trade/presell/index.vue",
                         "children": [
                             {
                                 "authType": 2,
                                 "sort": 1,
                                 "title": "当前记录",
-                                "code": "query_trade_spot_list",
-                                "component": "views/query/trade/spot/list/index.vue"
+                                "code": "query_trade_presell_list",
+                                "component": "views/query/trade/presell/list/index.vue"
                             },
                             {
                                 "authType": 2,
                                 "sort": 2,
                                 "title": "历史记录",
-                                "code": "query_trade_spot_history",
-                                "component": "views/query/trade/spot/history/index.vue"
+                                "code": "query_trade_presell_history",
+                                "component": "views/query/trade/presell/history/index.vue"
                             }
                         ]
                     },
                     {
                         "authType": 1,
                         "sort": 3,
-                        "title": "仓单预售",
-                        "code": "query_trade_presell",
+                        "title": "现货仓单",
+                        "code": "query_trade_spot",
                         "url": "spot",
                         "urlType": 1,
-                        "component": "views/query/trade/presell/index.vue",
+                        "component": "views/query/trade/spot/index.vue",
                         "children": [
                             {
                                 "authType": 2,
                                 "sort": 1,
                                 "title": "当前记录",
-                                "code": "query_trade_presell_list",
-                                "component": "views/query/trade/presell/list/index.vue"
+                                "code": "query_trade_spot_list",
+                                "component": "views/query/trade/spot/list/index.vue"
                             },
                             {
                                 "authType": 2,
                                 "sort": 2,
                                 "title": "历史记录",
-                                "code": "query_trade_presell_history",
-                                "component": "views/query/trade/presell/history/index.vue"
+                                "code": "query_trade_spot_history",
+                                "component": "views/query/trade/spot/history/index.vue"
                             }
                         ]
                     }

src/packages/pc/views/query/order/presell/history/index.vue

@@ -9,35 +9,51 @@
                 </template>
             </app-filter>
         </template>
-        <!-- 状态 -->
+        <!-- 商品代码/名称' -->
         <template #goodsname="{ row }">
             {{ row.goodscode }}/{{ row.goodsname }}
         </template>
-        <!-- 方向 -->
-        <template #buyorsell="{ value }">
-            {{ getBuyOrSellName(value) }}
+        <!-- 认购金额 -->
+        <template #orderamount="{ row }">
+            {{ (row.orderprice*row.orderqty).toFixed(2) }}
         </template>
-        <!-- 成交时间 -->
-        <template #tradedate="{ value }">
-            {{ formatDate(value) }}
+        <!-- 定金方式 -->
+        <template #presaledepositalgorithm="{ value }">
+            {{ value === 1 ? '比率' : '固定' }}
+        </template>
+        <!-- 定金比例 -->
+        <template #presaledepositvalue="{ value }">
+            {{ parsePercent(value) }}
+        </template>
+        <!-- 开始日期 -->
+        <template #starttime="{ value }">
+            {{ formatDate(value, 'YYYY-MM-DD') }}
+        </template>
+         <!-- 结束日期 -->
+         <template #endtime="{ value }">
+            {{ formatDate(value, 'YYYY-MM-DD') }}
+        </template>
+         <!-- 委托状态 -->
+         <template #orderstatus="{ value }">
+            {{ getOrderStatusName(value) }}
         </template>
     </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
+import { formatDate, parsePercent } from '@/filters'
 import { useRequest } from '@/hooks/request'
-import { queryMineTradeTradeDetails } from '@/services/api/transfer'
-import { getBuyOrSellName } from '@/constants/order'
+import { queryMineTradeOrderDetails } from '@/services/api/presale'
+import { getOrderStatusName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.MineTradeTradeDetailsReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Model.MineTradeOrderDetailsReq>()
 const filterDate = shallowRef<string[]>([])
 
-const { loading, dataList, run } = useRequest(queryMineTradeTradeDetails, {
+const { loading, dataList, run } = useRequest(queryMineTradeOrderDetails, {
     params: {
         ishis: true,
     },
@@ -46,16 +62,23 @@ const { loading, dataList, run } = useRequest(queryMineTradeTradeDetails, {
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'goodsname', label: '商品代码/名称' },
-    { prop: 'buyorsell', label: '方向' },
-    { prop: 'tradeqty', label: '转让数量' },
-    { prop: 'tradeprice', label: '转让价' },
-    { prop: 'presaleprice', label: '订货价' },
-    { prop: 'closepl', label: '损益' },
-    { prop: 'accountname', label: '对手方' },
-    { prop: 'tradedate', label: '成交时间' },
-    { prop: 'orderid', label: '成交单号' }
+    { prop: 'orderqty', label: '认购数量' },
+    { prop: 'orderprice', label: '认购价' },
+    { prop: 'orderamount', label: '认购金额' },
+    { prop: 'presaledepositalgorithm', label: '定金方式' },
+    { prop: 'presaledepositvalue', label: '定金比例' },
+    { prop: 'freezemargin', label: '预售定金' },
+    { prop: 'sellname', label: '发售方' },
+    { prop: 'starttime', label: '开始日期' },
+    { prop: 'endtime', label: '结束日期' },
+    { prop: 'orderstatus', label: '委托状态' },
+    { prop: 'ordertime', label: '委托时间' },
+    { prop: 'tradeprice', label: '预售价' },
+    { prop: 'tradeqty', label: '订单数量' },
+    { prop: 'orderid', label: '委托单号' }
 ])
 
+
 filterOptons.buttonList = [
     { lable: '查询', className: 'el-button--info', onClick: () => onSearch() },
     { lable: '重置', className: 'el-button--info', onClick: () => onSearch(true) }

src/packages/pc/views/query/order/presell/list/index.vue

@@ -1,40 +1,63 @@
 <!-- 成交记录-预售转让-当前认购 -->
 <template>
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
-        <!-- 状态 -->
+        <!-- 商品代码/名称' -->
         <template #goodsname="{ row }">
             {{ row.goodscode }}/{{ row.goodsname }}
         </template>
-        <!-- 方向 -->
-        <template #buyorsell="{ value }">
-            {{ getBuyOrSellName(value) }}
+        <!-- 认购金额 -->
+        <template #orderamount="{ row }">
+            {{ (row.orderprice*row.orderqty).toFixed(2) }}
         </template>
-        <!-- 成交时间 -->
-        <template #tradedate="{ value }">
-            {{ formatDate(value) }}
+        <!-- 定金方式 -->
+        <template #presaledepositalgorithm="{ value }">
+            {{ value === 1 ? '比率' : '固定' }}
+        </template>
+        <!-- 定金比例 -->
+        <template #presaledepositvalue="{ value }">
+            {{ parsePercent(value) }}
+        </template>
+        <!-- 开始日期 -->
+        <template #starttime="{ value }">
+            {{ formatDate(value, 'YYYY-MM-DD') }}
+        </template>
+         <!-- 结束日期 -->
+         <template #endtime="{ value }">
+            {{ formatDate(value, 'YYYY-MM-DD') }}
+        </template>
+         <!-- 委托状态 -->
+         <template #orderstatus="{ value }">
+            {{ getOrderStatusName(value) }}
         </template>
     </app-table>
 </template>
 
 <script lang="ts" setup>
 import { shallowRef } from 'vue'
-import { formatDate } from '@/filters'
+import { formatDate, parsePercent } from '@/filters'
 import { useRequest } from '@/hooks/request'
-import { queryMineTradeTradeDetails } from '@/services/api/transfer'
-import { getBuyOrSellName } from '@/constants/order'
+import { queryMineTradeOrderDetails } from '@/services/api/presale'
+import { getOrderStatusName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 
-const { loading, dataList } = useRequest(queryMineTradeTradeDetails, {})
+const { loading, dataList } = useRequest(queryMineTradeOrderDetails, {})
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'goodsname', label: '商品代码/名称' },
-    { prop: 'buyorsell', label: '方向' },
-    { prop: 'tradeqty', label: '转让数量' },
-    { prop: 'tradeprice', label: '转让价' },
-    { prop: 'presaleprice', label: '订货价' },
-    { prop: 'closepl', label: '损益' },
-    { prop: 'accountname', label: '对手方' },
-    { prop: 'tradedate', label: '成交时间' },
-    { prop: 'orderid', label: '成交单号' }
+    { prop: 'orderqty', label: '认购数量' },
+    { prop: 'orderprice', label: '认购价' },
+    { prop: 'orderamount', label: '认购金额' },
+    { prop: 'presaledepositalgorithm', label: '定金方式' },
+    { prop: 'presaledepositvalue', label: '定金比例' },
+    { prop: 'freezemargin', label: '预售定金' },
+    { prop: 'sellname', label: '发售方' },
+    { prop: 'starttime', label: '开始日期' },
+    { prop: 'endtime', label: '结束日期' },
+    { prop: 'orderstatus', label: '委托状态' },
+    { prop: 'ordertime', label: '委托时间' },
+    { prop: 'tradeprice', label: '预售价' },
+    { prop: 'tradeqty', label: '订单数量' },
+    { prop: 'orderid', label: '委托单号' }
 ])
+
 </script>

src/packages/pc/views/query/order/presell/transferhistory/index.vue

@@ -9,16 +9,16 @@
                 </template>
             </app-filter>
         </template>
-        <!-- 状态 -->
+        <!-- 商品代码/名称 -->
         <template #goodsname="{ row }">
             {{ row.goodscode }}/{{ row.goodsname }}
         </template>
-        <!-- 方向 -->
-        <template #buyorsell="{ value }">
-            {{ getBuyOrSellName(value) }}
+        <!-- 委托状态 -->
+        <template #orderstatus="{ value }">
+            {{ getOrderStatusName(value) }}
         </template>
         <!-- 成交时间 -->
-        <template #tradedate="{ value }">
+        <template #ordertime="{ value }">
             {{ formatDate(value) }}
         </template>
     </app-table>
@@ -29,15 +29,15 @@ import { shallowRef } from 'vue'
 import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
-import { queryMineTradeTradeDetails } from '@/services/api/transfer'
-import { getBuyOrSellName } from '@/constants/order'
+import { queryMineTradeOrders } from '@/services/api/transfer'
+import { getOrderStatusName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
-const { filterOptons, getQueryParams } = useDataFilter<Model.MineTradeTradeDetailsReq>()
+const { filterOptons, getQueryParams } = useDataFilter<Model.MineTradeOrdersReq>()
 const filterDate = shallowRef<string[]>([])
 
-const { loading, dataList, run } = useRequest(queryMineTradeTradeDetails, {
+const { loading, dataList, run } = useRequest(queryMineTradeOrders, {
     params: {
         ishis: true,
     },
@@ -46,14 +46,13 @@ const { loading, dataList, run } = useRequest(queryMineTradeTradeDetails, {
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'goodsname', label: '商品代码/名称' },
-    { prop: 'buyorsell', label: '方向' },
-    { prop: 'tradeqty', label: '转让数量' },
-    { prop: 'tradeprice', label: '转让价' },
+    { prop: 'orderqty', label: '转让数量' },
+    { prop: 'orderprice', label: '转让价' },
     { prop: 'presaleprice', label: '订货价' },
-    { prop: 'closepl', label: '损益' },
-    { prop: 'accountname', label: '对手方' },
-    { prop: 'tradedate', label: '成交时间' },
-    { prop: 'orderid', label: '成交单号' }
+    { prop: 'tradeqty', label: '摘牌数量' },
+    { prop: 'orderstatus', label: '委托状态' },
+    { prop: 'ordertime', label: '委托时间' },
+    { prop: 'orderid', label: '委托单号' }
 ])
 
 filterOptons.buttonList = [

src/packages/pc/views/query/order/presell/transferlist/index.vue

@@ -1,16 +1,16 @@
 <!-- 成交记录-预售转让-当前转让 -->
 <template>
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
-        <!-- 状态 -->
+        <!-- 商品代码/名称 -->
         <template #goodsname="{ row }">
             {{ row.goodscode }}/{{ row.goodsname }}
         </template>
-        <!-- 方向 -->
-        <template #buyorsell="{ value }">
-            {{ getBuyOrSellName(value) }}
+        <!-- 委托状态 -->
+        <template #orderstatus="{ value }">
+            {{ getOrderStatusName(value) }}
         </template>
         <!-- 成交时间 -->
-        <template #tradedate="{ value }">
+        <template #ordertime="{ value }">
             {{ formatDate(value) }}
         </template>
     </app-table>
@@ -20,21 +20,20 @@
 import { shallowRef } from 'vue'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
-import { queryMineTradeTradeDetails } from '@/services/api/transfer'
-import { getBuyOrSellName } from '@/constants/order'
+import { queryMineTradeOrders } from '@/services/api/transfer'
+import { getOrderStatusName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 
-const { loading, dataList } = useRequest(queryMineTradeTradeDetails, {})
+const { loading, dataList } = useRequest(queryMineTradeOrders, {})
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'goodsname', label: '商品代码/名称' },
-    { prop: 'buyorsell', label: '方向' },
-    { prop: 'tradeqty', label: '转让数量' },
-    { prop: 'tradeprice', label: '转让价' },
+    { prop: 'orderqty', label: '转让数量' },
+    { prop: 'orderprice', label: '转让价' },
     { prop: 'presaleprice', label: '订货价' },
-    { prop: 'closepl', label: '损益' },
-    { prop: 'accountname', label: '对手方' },
-    { prop: 'tradedate', label: '成交时间' },
-    { prop: 'orderid', label: '成交单号' }
+    { prop: 'tradeqty', label: '摘牌数量' },
+    { prop: 'orderstatus', label: '委托状态' },
+    { prop: 'ordertime', label: '委托时间' },
+    { prop: 'orderid', label: '委托单号' }
 ])
 </script>