1.处理首签样点击模块，不出来首签样通知模块的bug

Min
1 parent 3d9d864e
Showing 4 changed files with 10 additions and 8 deletions
src/mes/common/buttonComponent/index.js
src/mes/productionExec/index.js
src/mes/productionExec/noticeModal/index.js
src/mes/productionExec/productionExecMain/index.js
@@ -284,7 +284,7 @@ const ButtonComponent = props =&gt; {
     const { id, disabled, sName } = e;
     if (id == sModelsId || disabled) return;
  
-    if (e.name !== "首签样通知" || e.name !== "First Approval Sample Notice") {
+    if (e.name !== "首签样通知" && e.name?.trim() !== "First Approval Sample Notice") {
       props.onChangeRouter({
         routerPath: [currentContent],
         sModelsId: id,
@@ -31,7 +31,7 @@ const ProductionExec = props =&gt; {
   let obj = {
     ...props,
     openFirstNotice: ({ id, sName, name }) => {
-      if (name == "首签样通知") {
+      if (name == "首签样通知" || name?.trim() === 'First Approval Sample Notice') {
         setModal(true);
       }
     },
@@ -266,10 +266,11 @@ const firstNoticeModal = _props =&gt; {
     viewRow,
     tableName: viewName
   };
-
+  const firstNotice = commonFunc.showLocalMessage(props, 'firstNotice', '首签样通知');
+  const firstNoticeList = commonFunc.showLocalMessage(props, 'firstNoticeList', '版材消耗登记');
   return (
     <Modal
-      title="首签样通知"
+      title={firstNotice}
       footer={null}
       open={props.modalValue}
       width="65%"
@@ -365,7 +366,7 @@ const firstNoticeModal = _props =&gt; {
           </div>
         </div>
         <div class="noticeList">
-          <h2>首签样通知列表</h2>
+          <h2>{firstNoticeList}</h2>
           <div>
             <StaticEditTable {...tableProps} />
           </div>
@@ -1332,7 +1332,8 @@ const ProductionExecContent1 = props =&gt; {
     if (!oNavList) return;
     oNavList.childNodes[index].click();
   };
-
+  const MCR = commonFunc.showLocalMessage(props, 'MCR', '物料消耗登记');
+  const PMCR = commonFunc.showLocalMessage(props, 'PMCR', '版材消耗登记');
   return (
     <div className={styles.type1}>
       <div className="topPart">
@@ -1393,14 +1394,14 @@ const ProductionExecContent1 = props =&gt; {
               size="large"
               onClick={changeTab.bind(this, 0)}
             >
-              物料消耗登记
+              {MCR}
             </Button>
             <Button
               type="primary"
               size="large"
               onClick={changeTab.bind(this, 2)}
             >
-              版材消耗登记
+              {PMCR}
             </Button>
           </Space>
         </div>