Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/views/report/future_report/list/future_report/index.vue

@@ -21,8 +21,8 @@ import Filter from '../../components/filterTable/index.vue';
 import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
 import { queryTableList } from '../../../setup';
 import { handleInitTypeAndTime } from '@/views/report/setup';
-import { qryAreaSpotplReport } from '@/services/go/ermcp/report';
-import { Ermcp3AreaSpotPLReport } from '@/services/go/ermcp/report/interface';
+import { qryAreaSpotplReport, qryTaFutureDataReport } from '@/services/go/ermcp/report';
+import { Ermcp3AreaSpotPLReport, Ermcp3TaFutuReDataReport } from '@/services/go/ermcp/report/interface';
 import { TypeAndTime } from '@/views/report/interface';
 
 export default defineComponent({
@@ -40,13 +40,13 @@ export default defineComponent({
         // // 表格操作按钮列表
         // const { commonBtn, forDataBtn } = getBtnList('warehouse_info_normal', true);
         // 表格列表数据
-        const { loading, tableList, queryTable } = queryTableList<Ermcp3AreaSpotPLReport>(qryAreaSpotplReport);
+        const { loading, tableList, queryTable } = queryTableList<Ermcp3TaFutuReDataReport>(qryTaFutureDataReport);
         initData(() => {
             const { getInitTime, getInitType } = handleInitTypeAndTime();
             // 获取列表数据
             queryTable({ cycletype: getInitType(), cycletime: getInitTime() });
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_warehouse_category_report', []);
+            registerColumn('table_pcweb_futures_report', []);
         });
         function update(value: TypeAndTime) {
             queryTable(value);

src/views/report/sum_pl_report/list/sum_pl_report/index.vue

@@ -45,7 +45,7 @@ export default defineComponent({
             // 获取列表数据
             queryTable({ cycletype: getInitType(), cycletime: getInitTime() });
             // 注册表头信息 过滤
-            registerColumn('table_pcweb_exposure_report', []);
+            registerColumn('table_pcweb_aggregate_profit_and_loss', []);
         });
         function update(value: TypeAndTime) {
             queryTable(value);