fixed: #1007,#1002

src/views/order/pre_sale_warehouse_receipt/components/pre_sale_warehouse_receipt_pending_order/index.vue

@@ -1,42 +1,36 @@
 <template>
-    <!-- 仓单预售 挂单 -->
-    <a-table
-        :columns="columns"
-        class="srcollYTable expandLeftTable"
-        :scroll="{ x: '100%', y: '190px' }"
-        :pagination="false"
-        :loading="loading"
-        :expandedRowKeys="expandedRowKeys"
-        :customRow="Rowclick"
-        :expandIcon="expandIcon"
-        :expandIconAsCell="false"
-        rowKey="key"
-        :data-source="tableList"
-    >
-        <!-- 额外的展开行 -->
-        <template #expandedRowRender="{ record }">
-            <BtnList
-                :btnList="filterBtnList(btnList, record)"
-                class="btn-list-sticky"
-                :record="record"
-                @click="openComponent"
-            />
-        </template>
-        <!--  委托状态-->
-        <template #wrtradeorderstatus="{ record }">
-            <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
-        </template>
-        <!-- 挂牌类型 -->
-        <template #wrtradetype="{ record }">
-            <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
-        </template>
-    </a-table>
-    <component
-        :is="componentId"
-        v-if="componentId"
-        :selectedRow="selectedRow"
-        @cancel="closeComponent"
-    ></component>
+  <!-- 仓单预售 挂单 -->
+  <a-table :columns="columns"
+           class="srcollYTable expandLeftTable"
+           :scroll="{ x: '100%', y: '190px' }"
+           :pagination="false"
+           :loading="loading"
+           :expandedRowKeys="expandedRowKeys"
+           :customRow="Rowclick"
+           :expandIcon="expandIcon"
+           :expandIconAsCell="false"
+           rowKey="key"
+           :data-source="tableList">
+    <!-- 额外的展开行 -->
+    <template #expandedRowRender="{ record }">
+      <BtnList :btnList="filterBtnList(btnList, record)"
+               class="btn-list-sticky"
+               :record="record"
+               @click="openComponent" />
+    </template>
+    <!--  委托状态-->
+    <template #wrtradeorderstatus="{ record }">
+      <a>{{ getOrderStatusName(record.wrtradeorderstatus) }}</a>
+    </template>
+    <!-- 挂牌类型 -->
+    <template #wrtradetype="{ record }">
+      <a>{{ getWrOrderTypeName(record.buyorsell, record.wrtradetype) }}</a>
+    </template>
+  </a-table>
+  <component :is="componentId"
+             v-if="componentId"
+             :selectedRow="selectedRow"
+             @cancel="closeComponent"></component>
 </template>
 
 <script lang="ts">
@@ -47,7 +41,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';
 
@@ -88,7 +82,7 @@ export default defineComponent({
             loading,
             tableList,
             expandIcon,
-            getWrTradeOrderStatusName,
+            getOrderStatusName,
             getWrOrderTypeName,
         };
     },

src/views/order/spot_warran/components/spot_warrant_pending_order/index.vue

@@ -21,7 +21,7 @@
       </template>
       <!--  委托状态-->
       <template #wrtradeorderstatus="{ record }">
-        <a>{{ getWrTradeOrderStatusName(record.wrtradeorderstatus) }}</a>
+        <a>{{ getOrderStatusName(record.wrtradeorderstatus) }}</a>
       </template>
       <!-- 挂牌类型 -->
       <template #wrtradetype="{ record }">
@@ -44,7 +44,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';
 
@@ -83,7 +83,7 @@ export default defineComponent({
             ...handleComposeOrderTable<WrOrderDetail>(param),
             loading,
             tableList,
-            getWrTradeOrderStatusName,
+            getOrderStatusName,
             getWrOrderTypeName,
             filterBtnList,
             expandIcon,