huangbin 4 years ago
parent
commit
2eaaf7e8e4

+ 3 - 3
src/views/search/search_document_records/search_pre_sale_warehouse_receipt/search_pre_sale_warehouse_receipt_commission_record/index.vue

@@ -16,7 +16,7 @@
         >
             <!--  委托状态-->
             <template #wrtradeorderstatus="{ record }">
-                <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+                <a>{{ getOrderStatusName(record.wrtradeorderstatus) }}</a>
             </template>
             <!-- 挂牌类型 -->
             <template #wrtradetype="{ record }">
@@ -34,7 +34,7 @@ import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/inte
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import { getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
+import { getWrOrderTypeName, getOrderStatusName } from '@/common/constants/enumsName';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
@@ -62,7 +62,7 @@ export default defineComponent({
             loading,
             tableList,
             expandIcon,
-            getWrTradeOrderStatusName,
+            getOrderStatusName,
             getWrOrderTypeName,
         };
     },

+ 3 - 3
src/views/search/search_document_records/search_spot_warrant/search_spot_warrant_listing_record/index.vue

@@ -14,7 +14,7 @@
              :data-source="tableList">
       <!--  委托状态-->
       <template #wrtradeorderstatus="{ record }">
-        <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+        <a>{{ getOrderStatusName(record.wrtradeorderstatus) }}</a>
       </template>
       <!-- 挂牌类型 -->
       <template #wrtradetype="{ record }">
@@ -33,7 +33,7 @@ import { QueryWrOrderDetailReq, WrOrderDetail } from '@/services/go/wrtrade/inte
 import { getRecordItemTab } from '@/common/setup/order/orderData';
 import { handleComposeOrderTable } from '@/common/setup/table/compose';
 import { ComposeOrderTableParam } from '@/common/setup/table/interface';
-import { getWrOrderTypeName, getWrTradeOrderStatusName } from '@/common/constants/enumsName';
+import { getWrOrderTypeName, getOrderStatusName } from '@/common/constants/enumsName';
 import { BtnListType } from '@/common/components/btnList/interface';
 import { expandIcon } from '@/common/setup/table/clolumn';
 import { EnumRouterName } from '@/common/constants/enumRouterName';
@@ -61,7 +61,7 @@ export default defineComponent({
             ...handleComposeOrderTable<WrOrderDetail>(param),
             loading,
             tableList,
-            getWrTradeOrderStatusName,
+            getOrderStatusName,
             getWrOrderTypeName,
             expandIcon,
         };