Merge branch 'v20' of http://47.101.159.18:3000/Muchinfo/MTP20_WEB_GLOBAL into v20

src/packages/mobile/views/order/list/components/goodsorder/history/Index.vue

@@ -28,8 +28,8 @@
                                     <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                                 </li>
                                 <li>
-                                    <span>方向</span>
-                                    <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
+                                    <span>方向类型</span>
+                                    <span>{{ getBuyOrSellName(item.buyorsell) }}{{ getBuildTypeName(item.buildtype) }}</span>
                                 </li>
                                 <li>
                                     <span>委托数量</span>
@@ -63,7 +63,7 @@
 import { shallowRef, ref, defineAsyncComponent } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeOrderDetail } from '@/services/api/order'
-import { getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
+import { getBuyOrSellName, getWRTradeOrderStatusName, getBuildTypeName } from '@/constants/order'
 import { formatDate } from '@/filters'
 import { useComponent } from '@/hooks/component'
 import { Button, Calendar, Cell } from 'vant'

src/packages/mobile/views/order/list/components/goodsorder/list/Index.vue

@@ -19,8 +19,8 @@
                             <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                         </li>
                         <li>
-                            <span>方向</span>
-                            <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
+                            <span>方向类型</span>
+                            <span>{{ getBuyOrSellName(item.buyorsell) }}{{ getBuildTypeName(item.buildtype) }}</span>
                         </li>
                         <li>
                             <span>委托数量</span>
@@ -54,7 +54,7 @@ import { Button } from 'vant'
 import { useComponent } from '@/hooks/component'
 import { useRequest } from '@/hooks/request'
 import { queryTradeOrderDetail } from '@/services/api/order'
-import { getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
+import { getBuyOrSellName, getBuildTypeName, getWRTradeOrderStatusName } from '@/constants/order'
 import { formatDate, formatDecimal, handleRequestBigNumber } from '@/filters'
 import { useCancelOrder } from '@/business/trade'
 import { dialog } from '@/utils/vant'

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

@@ -9,10 +9,14 @@
                 <el-button type="primary" size="small" @click="openComponent('clear')">快撤</el-button>
             </div>
         </template>
-        <!-- 类型' -->
+        <!-- 方向 -->
         <template #buyorsell="{ value }">
             {{ getBuyOrSellName(value) }}
         </template>
+        <!-- 类型 -->
+        <template #buildtype="{ value }">
+            {{ getBuildTypeName(value) }}
+        </template>
         <!-- 挂牌类型 -->
         <template #orderstatus="{ value }">
             {{ getOrderStatusName(value) }}
@@ -35,7 +39,7 @@
 import { ref, defineAsyncComponent, onUnmounted } from 'vue'
 import { useRequest } from '@/hooks/request'
 import { useLocalPagination } from '@/hooks/pagination'
-import { getBuyOrSellName, getOrderStatusName } from '@/constants/order'
+import { getBuildTypeName, getBuyOrSellName, getOrderStatusName } from '@/constants/order'
 import { queryTradeOrderDetail } from '@/services/api/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import { formatDate } from '@/filters'
@@ -64,7 +68,8 @@ const { componentRef, componentId, openComponent, closeComponent } = useComponen
 
 const tableColumns = ref<Model.TableColumn[]>([
     { prop: 'goodsname', label: '订单合约' },
-    { prop: 'buyorsell', label: '类型' },
+    { prop: 'buyorsell', label: '方向' },
+    { prop: 'buildtype', label: '类型' },
     { prop: 'orderprice', label: '委托价' },
     { prop: 'orderqty', label: '委托数量' },
     { prop: 'tradeqty', label: '成交数量' },

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

@@ -9,6 +9,10 @@
                 </template>
             </app-filter>
         </template>
+        <!-- 方向 -->
+        <template #buyorsell="{ value }">
+            {{ getBuyOrSellName(value) }}
+        </template>
         <!-- 类型 -->
         <template #buildtype="{ value }">
             {{ getBuildTypeName(value) }}
@@ -30,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 } from '@/constants/order'
+import { getBuildTypeName, getWRTradeOrderStatusName, getBuyOrSellName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -46,6 +50,7 @@ const { loading, dataList, run } = useRequest(queryHisTradeOrderDetail, {
 
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'goodscode', label: '订单合约' },
+    { prop: 'buyorsell', label: '方向' },
     { prop: 'buildtype', label: '类型' },
     { prop: 'orderprice', label: '委托价' },
     { prop: 'orderqty', label: '委托数量' },

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

@@ -1,6 +1,10 @@
 <!-- 委托记录-商品合约-当前记录 -->
 <template>
     <app-table :data="dataList" v-model:columns="tableColumns" :loading="loading">
+         <!-- 方向 -->
+         <template #buyorsell="{ value }">
+            {{ getBuyOrSellName(value) }}
+        </template>
         <!-- 类型 -->
         <template #buildtype="{ value }">
             {{ getBuildTypeName(value) }}
@@ -21,7 +25,7 @@ import { shallowRef } from 'vue'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryTradeOrderDetail } from '@/services/api/order'
-import { getBuildTypeName, getWRTradeOrderStatusName } from '@/constants/order'
+import { getBuildTypeName, getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
 import AppTable from '@pc/components/base/table/index.vue'
 
 const { loading, dataList } = useRequest(queryTradeOrderDetail, {
@@ -33,6 +37,7 @@ const { loading, dataList } = useRequest(queryTradeOrderDetail, {
 const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'goodscode', label: '订单合约' },
     { prop: 'goodsname', label: '商品名称' },
+    { prop: 'buyorsell', label: '方向' },
     { prop: 'buildtype', label: '类型' },
     { prop: 'orderprice', label: '委托价' },
     { prop: 'orderqty', label: '委托数量' },