From 37a134bd23ec4b227a0e010b08a1a89c2bbaaa0d Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 03 十一月 2020 17:10:14 +0800 Subject: [PATCH] 2020-11-03 --- src/tabviews/commontable/index.jsx | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx index dc44e40..10b5d2e 100644 --- a/src/tabviews/commontable/index.jsx +++ b/src/tabviews/commontable/index.jsx @@ -517,6 +517,10 @@ let _orderBy = orderBy || setting.order let param = UtilsDM.getQueryDataParams(setting, arr_field, search, _orderBy, pageIndex, pageSize, BID, this.props.menuType, this.props.dataManager) + if (param.func === 'sPC_Get_TableData') { + param.menuname = this.props.MenuName || '' + } + let result = await Api.genericInterface(param) if (result.status) { this.setState({ @@ -555,6 +559,10 @@ let _orderBy = orderBy || setting.order let param = UtilsDM.getStatQueryDataParams(setting, statFields, search, _orderBy, BID, this.props.menuType, this.props.dataManager) + + if (param.func === 'sPC_Get_TableData') { + param.menuname = this.props.MenuName || '' + } Api.genericInterface(param).then(res => { if (res.status) { @@ -858,7 +866,7 @@ } render() { - const { menuType } = this.props + const { menuType, MenuName } = this.props const { BID, setting, searchlist, pageSize, actions, columns, loadingview, viewlost, pickup, config, userConfig, tabActive, chartId, search, selectedData } = this.state return ( @@ -893,6 +901,7 @@ BID={BID} setting={setting} actions={actions} + MenuName={MenuName} dict={this.state.dict} MenuID={this.props.MenuID} selectedData={selectedData} @@ -906,9 +915,9 @@ {this.props.menuType !== 'HS' ? <SettingComponent config={config} columns={columns} + MenuName={MenuName} dict={this.state.dict} MenuID={this.props.MenuID} - MenuName={this.props.MenuName} permAction={this.props.permAction} permRoles={this.props.permRoles} userConfig={this.state.userConfig} @@ -924,6 +933,7 @@ config={config} setting={setting} columns={columns} + MenuName={MenuName} pageSize={pageSize} dict={this.state.dict} data={this.state.data} @@ -948,6 +958,7 @@ BID={BID} plot={item} config={config} + MenuName={MenuName} tableId="mainTable" data={this.state.data} MenuID={this.props.MenuID} @@ -967,6 +978,7 @@ BID={BID} plot={item} config={config} + MenuName={MenuName} data={this.state.data} getexceloutparam={this.getexceloutparam} loading={this.state.loading} -- Gitblit v1.8.0