xlyErp / xlyUmi

Commit 356491b83aaa74030d79f74e5da99937dc7e49b5

Authored by Min
1 parent 749504f5

1.处理工艺卡，点击部件行，工艺参数就频闪问题 

2，处理复制部件，改变排版数，部件消失bug
Inline Side-by-side
Showing 2 changed files with 13 additions and 2 deletions
src/components/Common/CommonViewDragable/index.js
  View file @356491b
... ... @@ -30,7 +30,10 @@ const CommonViewDragable = props => {
30 30 const { tableName } = props;
31 31 const [state, dispatch] = useReducer(reducer, initialState);
32 32  
33   - const selectedRowKeys = props[`${tableName}SelectedRowKeys`] || [];
  33 + let selectedRowKeys = props[`${tableName}SelectedRowKeys`] || [];
  34 + if(commonUtils.isEmptyArr(selectedRowKeys) && commonUtils.isNotEmptyArr(props[`${tableName}Data`]) ) {
  35 + selectedRowKeys = [props[`${tableName}Data`][0]]
  36 + }
34 37 const key = selectedRowKeys[0] || commonUtils.createSid();
35 38 const selectedData = handleGetSelectedData(props);
36 39  
... ...
src/components/Manufacture/ProcessCardPackTableTreeNew/index.js
  View file @356491b
... ... @@ -3008,7 +3008,7 @@ const controlProps = props => {
3008 3008 /* 排版数改变时 如果该控制表合版数据只有一条 则改变packData该条的拼版数 改变备注 */
3009 3009 if (commonUtils.isNotEmptyArr(packData)) {
3010 3010 const packFilterData = packData.filter(item => item.sControlId === tableDataRow.sId);
3011   - console.log("1222", packFilterData);
  3011 +
3012 3012 if (commonUtils.isNotEmptyArr(packFilterData) && packFilterData.length === 1) {
3013 3013 const iIndex = packData.findIndex(itemPack => itemPack.sId === packFilterData[0].sId);
3014 3014 const addState = {};
... ... @@ -3017,6 +3017,14 @@ const controlProps = props => {
3017 3017 addState.handleType = commonUtils.isEmpty(tableDataRow.handleType) ? "update" : tableDataRow.handleType;
3018 3018 tableDataRow.iCombineNum = tableDataRow.dSinglePQty;
3019 3019 if (iIndex > -1) {
  3020 + if(commonUtils.isEmptyObject(packData[iIndex].sProductNo)) {
  3021 + const slaveRow = slaveData.find(row => row.sId === packData[iIndex].sSlaveId);
  3022 +
  3023 + if(commonUtils.isNotEmptyObject(slaveRow)) {
  3024 + packData[iIndex].sProductNo = slaveRow.sProductNo;
  3025 + packData[iIndex].sProductName = slaveRow.sProductName;
  3026 + }
  3027 + }
3020 3028 packData[iIndex] = { ...packData[iIndex], ...addState };
3021 3029 const { sId, sProductNo, dProductQty, dCombineQty, dFactProductQty, sCombinePartsName } = packData[iIndex];
3022 3030 const tableCombineSelectedData = [];
... ...