Commit e5dd9ad35960ccdf3696b2f3cd4c1e9ca6f8af59
Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi
Showing
1 changed file
with
2 additions
and
2 deletions
src/components/Common/CommonBillEvent.js
| @@ -764,8 +764,8 @@ export default (ChildComponent) => { | @@ -764,8 +764,8 @@ export default (ChildComponent) => { | ||
| 764 | 764 | ||
| 765 | /** 获取主表、从表、审核表数据 */ | 765 | /** 获取主表、从表、审核表数据 */ |
| 766 | handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => { | 766 | handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => { |
| 767 | - const { currentId } = this.props; /* 当前页签数据 */ | ||
| 768 | - const sId = currentId !== undefined ? currentId : ''; | 767 | + const { currentId, masterData = {} } = this.props; /* 当前页签数据 */ |
| 768 | + const sId = currentId || masterData.sId || ''; | ||
| 769 | this.props.handleGetDataOne({ name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick, slaveConfig }); | 769 | this.props.handleGetDataOne({ name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick, slaveConfig }); |
| 770 | // commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sProductId', []); | 770 | // commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sProductId', []); |
| 771 | // commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sProductNo', []); | 771 | // commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sProductNo', []); |