Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税
This commit is contained in:
commit
7fe358db57
|
|
@ -343,7 +343,7 @@ class Index extends Component {
|
|||
const { addAllLoading, incomeTaxStatus } = this.state;
|
||||
const commonBtns = [
|
||||
<Button type="primary" onClick={this.handleOpenImport}>导入</Button>,
|
||||
<Button type="ghost" onClick={this.handleOnlineAccess}>{getLabel(111, "在线获取")}</Button>,
|
||||
// <Button type="ghost" onClick={this.handleOnlineAccess}>{getLabel(111, "在线获取")}</Button>,
|
||||
<Button type="ghost" onClick={() => this.handleAddData()}>新建</Button>,
|
||||
<Dropdown
|
||||
overlay={
|
||||
|
|
|
|||
|
|
@ -67,6 +67,7 @@ class Index extends Component {
|
|||
return _.map(_.filter(toJS(declareTableStore.columns), (item) => (item.display === "true" && showColumns.includes(item["dataIndex"]))), o => ({
|
||||
dataIndex: o.dataIndex, title: o.title, width: 150,
|
||||
render: (text, record) => {
|
||||
if (!record[o["dataIndex"]]) return <span/>;
|
||||
return Object.prototype.toString.call(record[o["dataIndex"]]) === "[object String]" ? <span>{text}</span> :
|
||||
<div className="comparison-column-item-container">
|
||||
<div className="comparison-single-row">
|
||||
|
|
|
|||
Loading…
Reference in New Issue