diff --git a/src/components/Common/CommonBillEvent.js b/src/components/Common/CommonBillEvent.js index e4d6bdb..97796dd 100644 --- a/src/components/Common/CommonBillEvent.js +++ b/src/components/Common/CommonBillEvent.js @@ -2290,8 +2290,6 @@ export default (ChildComponent) => { }, onCancel() { }, - okText: '保存', - cancelText: '不保存', }); this.props.onSaveState({ loading: false, diff --git a/src/components/productionMainPlan/productionMainPlan.js b/src/components/productionMainPlan/productionMainPlan.js index 71a3282..b524944 100644 --- a/src/components/productionMainPlan/productionMainPlan.js +++ b/src/components/productionMainPlan/productionMainPlan.js @@ -561,6 +561,10 @@ const ProductionPlanComponent = Form.create({ }; } + const WorkCenterMachinePlan = commonFunc.showLocalMessage(props, "WorkCenter&MachinePlan", "工作中心&机台计划"); + + const MPS = commonFunc.showLocalMessage(props, "MPS", "产品主计划"); + const machineCharProps = commonBusiness.getCharTypes('machineChar', charConfigArr, charConfigAndDataArr, props); const setUp = commonFunc.showMessage(app.commonConst, 'setUp');/* 上移 */ const setDown = commonFunc.showMessage(app.commonConst, 'setDown');/* 下移 */ @@ -584,7 +588,7 @@ const ProductionPlanComponent = Form.create({ - +
@@ -612,7 +616,7 @@ const ProductionPlanComponent = Form.create({
- + @@ -1563,7 +1563,7 @@ const ProductionScheduleComponent = Form.create({
- 工作中心 + {WorkCenter}
{