xxxxx

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

@@ -34,7 +34,7 @@ import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
-import { getBuildTypeName, getWRTradeOrderStatusName, getBuyOrSellName } from '@/constants/order'
+import { getBuildTypeName, getWRTradeOrderStatusName, getBuyOrSellName, getWRTradeOrderStatusList } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -48,6 +48,15 @@ const { loading, dataList, run } = useRequest(queryHisTradeOrderDetail, {
     manual: true
 })
 
+filterOptons.selectList = [
+    {
+        key: 'orderStatus',
+        selectedValue: 3,
+        options: getWRTradeOrderStatusList().filter(e => { return [1, 2, 3, 4, 6, 7, 8, 9, 10, 11].includes(e.value)}),
+        locked: true,
+    }
+]
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'goodscode', label: '订单合约' },
     { prop: 'buyorsell', label: '方向' },

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

@@ -38,13 +38,22 @@ import { formatDate } from '@/filters'
 import { useDataFilter } from '@/hooks/datatable'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
-import { getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
+import { getBuyOrSellName, getWRTradeOrderStatusName, getWRTradeOrderStatusList } 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.HisTradeOrderDetailReq>()
 const filterDate = shallowRef<string[]>([])
 
+filterOptons.selectList = [
+    {
+        key: 'orderStatus',
+        selectedValue: 3,
+        options: getWRTradeOrderStatusList().filter(e => { return [1, 2, 3, 4, 6, 7, 8, 9, 10, 11].includes(e.value)}),
+        locked: true,
+    }
+]
+
 const formData = reactive<Model.HisTradeOrderDetailReq>({
     tradeMode: '46',
 })

src/packages/pc/views/query/trade/swap/history/index.vue

@@ -42,7 +42,7 @@ import { formatDate, formatDecimal, tmMatchAccountID } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable'
 import { queryHisTradeDetail, } from '@/services/api/order'
-import { getBuildTypeName, getBuyOrSellName } from '@/constants/order'
+import { getBuildTypeName, getBuyOrSellName, getBuildTypeList } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -60,6 +60,16 @@ const { loading, dataList, run } = useRequest(queryHisTradeDetail, {
     manual: true
 })
 
+
+filterOptons.selectList = [
+    {
+        key: 'buildType',
+        selectedValue: 1,
+        options: getBuildTypeList(),
+        locked: true,
+    }
+]
+
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'tradeid', label: '成交单号' },
     { prop: 'goodsname', label: '商品代码/名称' },

src/types/model/goods.d.ts

@@ -380,7 +380,6 @@ declare namespace Model {
         sellreleaseratio: number
         /// 更新时间
         updatetime: string
-
     }
 
     /** 查询供求列表 请求 */