huangbin %!s(int64=4) %!d(string=hai) anos
pai
achega
2e75ef3f91

+ 1 - 2
src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_basis_difference/index.vue

@@ -51,12 +51,11 @@ export default defineComponent({
             };
             queryTable(queryOrderQuote, param);
         };
-        Bus.$on('spotTrade', queryTableAction);
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.warehouse_receipt_trade_price,
-            tableName: 'table_pcweb_spot_trade_warehouse_price',
+            tableName: 'table_pcweb_financing_manage_order_transaction',
             tableFilterKey: [],
             isDetail: false,
         };

+ 2 - 44
src/views/market/spot_trade/spot_trade_order_transaction/spot_trade_order_transaction_listing_transfer/index.vue

@@ -51,60 +51,18 @@ export default defineComponent({
             };
             queryTable(queryOrderQuote, param);
         };
-        Bus.$on('spotTrade', queryTableAction);
         // 表格通用逻辑
         const param: ComposeTableParam = {
             queryFn: queryTableAction,
             menuType: EnumRouterName.warehouse_receipt_trade_price,
-            tableName: 'table_pcweb_spot_trade_warehouse_price',
+            tableName: 'table_pcweb_financing_manage_order_transaction',
             tableFilterKey: [],
             isDetail: false,
         };
-        const {
-            contextMenu,
-            openContext,
-            closeContext, // 右键
-            columns,
-            registerColumn,
-            updateColumn, // 表头
-            expandedRowKeys,
-            selectedRow,
-            Rowclick, // 表格折腾面板数据与单击、双击事件
-            componentId,
-            closeComponent, // 控制异步组件
-            firstBtn, // 表格按钮
-        } = handleComposeTable<WrOrderQuote>(param);
-        function search(value: Object) {
-            const param: QueryOrderQuoteReq = {
-                wrpricetype: 1,
-                haswr: 1,
-            };
-            Object.assign(param, value);
-            queryTable(queryOrderQuote, param);
-        }
-        function buyOpen(value: any, goods: any) {
-            componentId.value = 'postBuying';
-            selectedRow.value = value;
-        }
-
         return {
-            contextMenu,
-            openContext,
-            closeContext, // 右键
-            columns,
-            registerColumn,
-            updateColumn, // 表头
-            expandedRowKeys,
-            selectedRow,
-            Rowclick, // 表格折腾面板数据与单击、双击事件
-            componentId,
-            closeComponent, // 控制异步组件
-            firstBtn, // 表格按钮
-            name: EnumRouterName.warehouse_receipt_trade_price,
+            ...handleComposeTable<WrOrderQuote>(param),
             loading,
             tableList,
-            search,
-            buyOpen,
         };
     },
 });

+ 2 - 2
src/views/order/performance_information/components/components/detail/index.vue

@@ -21,7 +21,7 @@
         <template #stepvalue="{ text }">
           <span>{{(text* 100).toFixed(0)}}</span>
         </template>
-        <template #handlestatus="{ text }">
+        <template #stepstatus="{ text }">
           <span>{{getPerformanceStatusName(text)}}</span>
         </template>
       </a-table>
@@ -47,7 +47,7 @@ const columns = [
     { title: '步骤值(%)', dataIndex: 'stepvalue', key: 'stepvalue', align: 'center', slots: { customRender: 'stepvalue' } },
     { title: '距离上一步', dataIndex: 'stepdays', key: 'stepdays', align: 'center' },
     { title: '自动', dataIndex: 'isauto', key: 'isauto', align: 'center', slots: { customRender: 'isauto' } },
-    { title: '当前状态', dataIndex: 'handlestatus', key: 'handlestatus', align: 'center', slots: { customRender: 'handlestatus' } },
+    { title: '当前状态', dataIndex: 'stepstatus', key: 'stepstatus', align: 'center', slots: { customRender: 'stepstatus' } },
 ];
 
 export default defineComponent({