Commit 411ce48e044c506f9c73202bba0e63fa70168981
Merge branch '云南五彩' of http://git.xlyprint.cn/xlyErp/xlyUmi into 云南五彩
Showing
1 changed file
with
5 additions
and
1 deletions
src/components/Common/CommonBillEvent.js
| @@ -3472,7 +3472,8 @@ export default (ChildComponent) => { | @@ -3472,7 +3472,8 @@ export default (ChildComponent) => { | ||
| 3472 | tableDataRow.key = tableDataRow.sId; | 3472 | tableDataRow.key = tableDataRow.sId; |
| 3473 | tableDataRow.sPartsName = `${tableData[tableDataIndex].sPartsName}new`; | 3473 | tableDataRow.sPartsName = `${tableData[tableDataIndex].sPartsName}new`; |
| 3474 | tableDataRow.sCombinedMemo = originalNode.sCombinedMemo; | 3474 | tableDataRow.sCombinedMemo = originalNode.sCombinedMemo; |
| 3475 | - | 3475 | + tableDataRow.sPartProductId = ''; |
| 3476 | + tableDataRow.sPartProductName = ''; | ||
| 3476 | 3477 | ||
| 3477 | // 处理层级关系 - 修改这里 | 3478 | // 处理层级关系 - 修改这里 |
| 3478 | if (originalNode.sControlParentId) { | 3479 | if (originalNode.sControlParentId) { |
| @@ -3683,6 +3684,7 @@ export default (ChildComponent) => { | @@ -3683,6 +3684,7 @@ export default (ChildComponent) => { | ||
| 3683 | this.handleTableWorkCopyAll(name, isWait, isTree); | 3684 | this.handleTableWorkCopyAll(name, isWait, isTree); |
| 3684 | return; | 3685 | return; |
| 3685 | } | 3686 | } |
| 3687 | + | ||
| 3686 | const { | 3688 | const { |
| 3687 | [`${name}Data`]: tableData, [`${name}SelectedRowKeys`]: tableSelectedRowKeys, | 3689 | [`${name}Data`]: tableData, [`${name}SelectedRowKeys`]: tableSelectedRowKeys, |
| 3688 | } = this.props; | 3690 | } = this.props; |
| @@ -3709,6 +3711,8 @@ export default (ChildComponent) => { | @@ -3709,6 +3711,8 @@ export default (ChildComponent) => { | ||
| 3709 | tableDataRow.sId = commonUtils.createSid(); | 3711 | tableDataRow.sId = commonUtils.createSid(); |
| 3710 | tableDataRow.handleType = 'add'; | 3712 | tableDataRow.handleType = 'add'; |
| 3711 | tableDataRow.key = tableDataRow.sId; | 3713 | tableDataRow.key = tableDataRow.sId; |
| 3714 | + tableDataRow.sPartProductId = ''; | ||
| 3715 | + console.log('111', tableDataRow); | ||
| 3712 | const iOrderArr = []; | 3716 | const iOrderArr = []; |
| 3713 | tableData.forEach((item) => { | 3717 | tableData.forEach((item) => { |
| 3714 | const iOrder = commonUtils.isNotEmptyNumber(item.iOrder) ? item.iOrder : 0; /* 获取tableData中iOrder最大值 */ | 3718 | const iOrder = commonUtils.isNotEmptyNumber(item.iOrder) ? item.iOrder : 0; /* 获取tableData中iOrder最大值 */ |