Commit 68d946eb93b2f3fe562b6e77f13c25d129f47c65
1 parent
0e90e312
优化手机端copyto到commobilePadBill;
Showing
3 changed files
with
18 additions
and
8 deletions
src/components/Common/CommonComponent/index.js
| @@ -3434,7 +3434,8 @@ export default class CommonComponent extends Component { | @@ -3434,7 +3434,8 @@ export default class CommonComponent extends Component { | ||
| 3434 | this.props.showConfig.sDropDownType !== "popup" && | 3434 | this.props.showConfig.sDropDownType !== "popup" && |
| 3435 | !commonUtils.isEmpty(this.props.showConfig.sActiveId) && | 3435 | !commonUtils.isEmpty(this.props.showConfig.sActiveId) && |
| 3436 | !commonUtils.isEmpty(this.props.showConfig.sActiveKey) && | 3436 | !commonUtils.isEmpty(this.props.showConfig.sActiveKey) && |
| 3437 | - (commonUtils.isNotEmptyObject(this.props.dataValue) || commonUtils.isNotEmptyNumber(this.props.dataValue)) | 3437 | + (commonUtils.isNotEmptyObject(this.props.dataValue) || commonUtils.isNotEmptyNumber(this.props.dataValue)) && |
| 3438 | + !location.pathname.includes("mobile") | ||
| 3438 | ) { | 3439 | ) { |
| 3439 | viewInfo = ( | 3440 | viewInfo = ( |
| 3440 | <div | 3441 | <div |
src/components/Common/CommonNewBillEvent.js
| @@ -295,7 +295,11 @@ export default ChildComponent => { | @@ -295,7 +295,11 @@ export default ChildComponent => { | ||
| 295 | config.masterConfig = masterConfig; | 295 | config.masterConfig = masterConfig; |
| 296 | 296 | ||
| 297 | if (sId === "") { | 297 | if (sId === "") { |
| 298 | - addState = await this.handleAdd(config, nextProps.app.currentPane.copyTo, true); | 298 | + let copyTo = nextProps.app.currentPane.copyTo; |
| 299 | + if (nextProps.formRoute === '/indexMobile/commobilePadBill') { | ||
| 300 | + copyTo = nextProps.copyTo; | ||
| 301 | + } | ||
| 302 | + addState = await this.handleAdd(config, copyTo, true); | ||
| 299 | // 如果配置了bEmptyAddLine, 默认不添加空数据 | 303 | // 如果配置了bEmptyAddLine, 默认不添加空数据 |
| 300 | formData.forEach((item, index) => { | 304 | formData.forEach((item, index) => { |
| 301 | if (index > 0) { | 305 | if (index > 0) { |
src/mobile/common/CommobilePadBill/index.less
| @@ -189,17 +189,18 @@ | @@ -189,17 +189,18 @@ | ||
| 189 | height: 38px; | 189 | height: 38px; |
| 190 | } | 190 | } |
| 191 | 191 | ||
| 192 | - // .ant-select-selector { | 192 | + .ant-select-selector { |
| 193 | // border: none !important; | 193 | // border: none !important; |
| 194 | // background: #f0f0f0 !important; | 194 | // background: #f0f0f0 !important; |
| 195 | // border-radius: 5px !important; | 195 | // border-radius: 5px !important; |
| 196 | // height: 32px !important; | 196 | // height: 32px !important; |
| 197 | 197 | ||
| 198 | - // .ant-select-selection-item, | ||
| 199 | - // .ant-select-selection-placeholder { | ||
| 200 | - // line-height: 32px !important; | ||
| 201 | - // } | ||
| 202 | - // } | 198 | + .ant-select-selection-item, |
| 199 | + .ant-select-selection-placeholder { | ||
| 200 | + font-size: 18px; | ||
| 201 | + line-height: 36px !important; | ||
| 202 | + } | ||
| 203 | + } | ||
| 203 | 204 | ||
| 204 | // .ant-input-affix-wrapper { | 205 | // .ant-input-affix-wrapper { |
| 205 | // height: 28px; | 206 | // height: 28px; |
| @@ -269,6 +270,10 @@ | @@ -269,6 +270,10 @@ | ||
| 269 | border-top: 1px solid #aaa !important; | 270 | border-top: 1px solid #aaa !important; |
| 270 | } | 271 | } |
| 271 | 272 | ||
| 273 | + table tr td.ant-table-selection-column .ant-radio-wrapper { | ||
| 274 | + margin-top: 7px; | ||
| 275 | + } | ||
| 276 | + | ||
| 272 | .ant-table-thead>tr>th { | 277 | .ant-table-thead>tr>th { |
| 273 | border-right: 1px solid #aaa !important; | 278 | border-right: 1px solid #aaa !important; |
| 274 | font-size: 18px; | 279 | font-size: 18px; |