Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi

Min
2 parents 9d2d1b65 ee61d7ba
Showing 1 changed file with 2 additions and 2 deletions
src/components/Common/CommonBillEvent.js
@@ -764,8 +764,8 @@ export default (ChildComponent) =&gt; {
  
     /**   获取主表、从表、审核表数据   */
     handleGetData = async (masterConfig, slaveConfig, checkConfig, bEditClick) => {
-      const { currentId } = this.props; /* 当前页签数据 */
-      const sId = currentId !== undefined ? currentId : '';
+      const { currentId, masterData = {} } = this.props; /* 当前页签数据 */
+      const sId = currentId || masterData.sId || '';
       this.props.handleGetDataOne({ name: 'master', configData: masterConfig, condition: { sId, pageSize: '', pageNum: '' }, bEditClick, slaveConfig });
       // commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sProductId', []);
       // commonUtils.setStoreDropDownData(sModelsId, 'slave', 'sProductNo', []);