Merge remote-tracking branch 'origin/main'

This commit is contained in:
lihao 2025-12-08 12:25:53 +08:00
commit 6e732c1b75
2 changed files with 12 additions and 1 deletions

View File

@ -59,7 +59,7 @@ import {rowCopyPasteUtils} from '../../../../../mmpub/mmpub/pub/tool/cardTableTo
import {buttonController} from './index';
import {showErrorInfo, showSuccessInfo, showWarningDialog} from '../../../../../mmpub/mmpub/pub/tool/messageUtil.js';
import {getLangByResId} from '../../../../../mmpub/mmpub/pub/tool/multiLangUtil';
import toPlm from "../btnClicks/toPlm";// 传递设计任务
import toPlm from "../btnClicks/toPlm"; // 传递设计任务
const {updateCache} = cardCache;
let tableId = PMO_CARD.tableId;
@ -689,6 +689,7 @@ export default function clickBtn(props, id, text, record, index) {
}
}
});
break;
}
case "pushtoQms": {
rowIds = [];
@ -704,6 +705,7 @@ export default function clickBtn(props, id, text, record, index) {
}
}
});
break;
}
}
}

View File

@ -90,6 +90,14 @@ function setItemEditableByAdjust(props, record, index) {
// 产品行可以修改:计划产出数量、计划产出主数量、计划投入数量、计划投入主数量、计划开工时间、计划完工时间、预计完工时间、生产批次号、备注
this.props.cardTable.setEditableByIndex(tableId, index, curitems, true);
this.props.cardTable.setEditableByIndex(tableId, index, bodydefitems, true);
this.props.cardTable.setEditableByIndex(
tableId,
index,
[
BODYATTRCODE.NRWXIS
],
true
);
} else if (BODYFBILLSTATUS.put == itemStatus) {
// 判断3产品行为投放态时
// 产品行可以修改:计划产出数量、计划产出主数量、计划投入数量、计划投入主数量、计划完工时间、预计完工时间、备注
@ -97,6 +105,7 @@ function setItemEditableByAdjust(props, record, index) {
tableId,
index,
[
BODYATTRCODE.NRWXIS,
BODYATTRCODE.NMMASTNUM,
BODYATTRCODE.NMMNUM,
BODYATTRCODE.NPLANPUTASTNUM,