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

src/common/methods/table/interface.ts

@@ -68,7 +68,7 @@ table_pcweb_change_in_future:string, // 报表-敞口报表-期货变动量明
 table_pcweb_change_in_parameter_adjustment:string, // 报表-敞口报表-参数调整变动量明细
 table_pcweb_spot_report_details:string, // 报表-现货报表-现货明细
 table_pcweb_financial_statement_category_breakdown:string, // 报表-财务报表-品类明细
-table_pcweb_financial_statement_brand_details:string, // 报表-财务报表-品类明细
+table_pcweb_financial_statement_brand_details:string, // 报表-财务报表-品牌明细
 table_pcweb_futures_statement_account_details:string, // 报表-期货报表-账户明细
 table_pcweb_inventory_commodity_report_brand_details:string, // 报表-库存（商品）报表-品牌明细
 table_pcweb_inventory_commodity_report_warehouse_details:string, // 报表-库存（商品）报表-仓库明细

src/views/platinum/platinum_customer_info/list/index.ts

@@ -2,5 +2,4 @@ import { QueryCustomInfoType } from '@/services/go/ermcp/customInfo/interface';
 import { queryTableList } from './setup';
 
 export { queryTableList };
-export type { QueryCustomInfoType };
-
+export type { QueryCustomInfoType };

src/views/report/finance-report/list/finance_report_finance/index.vue

@@ -93,12 +93,12 @@ export default defineComponent({
                 // 品类明细
                 // 注册表头
                 registerColumnDetail('table_pcweb_financial_statement_category_breakdown', []);
-                param.sumfields = '2';
+                param.sumfields = '1,2';
             } else if (code === 'finance_report_finance_brand_details') {
                 // 品牌明细
                 // 注册表头
-                registerColumnDetail('table_pcweb_inventory_commodity_report_brand_details', []);
-                param.sumfields = '3';
+                registerColumnDetail('table_pcweb_financial_statement_brand_details', []);
+                param.sumfields = '1,2,3';
             } else {
                 console.error(`${lable}没有配置对应的code: ${code},`);
                 return;