diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js index d7fa5b8..9d1136c 100644 --- a/src/components/Common/CommonComponent/index.js +++ b/src/components/Common/CommonComponent/index.js @@ -3434,7 +3434,8 @@ export default class CommonComponent extends Component { this.props.showConfig.sDropDownType !== "popup" && !commonUtils.isEmpty(this.props.showConfig.sActiveId) && !commonUtils.isEmpty(this.props.showConfig.sActiveKey) && - (commonUtils.isNotEmptyObject(this.props.dataValue) || commonUtils.isNotEmptyNumber(this.props.dataValue)) + (commonUtils.isNotEmptyObject(this.props.dataValue) || commonUtils.isNotEmptyNumber(this.props.dataValue)) && + !location.pathname.includes("mobile") ) { viewInfo = (
{ config.masterConfig = masterConfig; if (sId === "") { - addState = await this.handleAdd(config, nextProps.app.currentPane.copyTo, true); + let copyTo = nextProps.app.currentPane.copyTo; + if (nextProps.formRoute === '/indexMobile/commobilePadBill') { + copyTo = nextProps.copyTo; + } + addState = await this.handleAdd(config, copyTo, true); // 如果配置了bEmptyAddLine, 默认不添加空数据 formData.forEach((item, index) => { if (index > 0) { diff --git a/src/mobile/common/CommobilePadBill/index.less b/src/mobile/common/CommobilePadBill/index.less index b63e7ae..2009724 100644 --- a/src/mobile/common/CommobilePadBill/index.less +++ b/src/mobile/common/CommobilePadBill/index.less @@ -189,17 +189,18 @@ height: 38px; } - // .ant-select-selector { + .ant-select-selector { // border: none !important; // background: #f0f0f0 !important; // border-radius: 5px !important; // height: 32px !important; - // .ant-select-selection-item, - // .ant-select-selection-placeholder { - // line-height: 32px !important; - // } - // } + .ant-select-selection-item, + .ant-select-selection-placeholder { + font-size: 18px; + line-height: 36px !important; + } + } // .ant-input-affix-wrapper { // height: 28px; @@ -269,6 +270,10 @@ border-top: 1px solid #aaa !important; } + table tr td.ant-table-selection-column .ant-radio-wrapper { + margin-top: 7px; + } + .ant-table-thead>tr>th { border-right: 1px solid #aaa !important; font-size: 18px;