调机开始状态

chenxt
1 parent 440782b8
Showing 2 changed files with 17 additions and 6 deletions
src/mes/common/commonOperationBarComponent/index.js
src/mes/productionExec/productionExecMain/index.js
@@ -739,7 +739,7 @@ const useCommonOperationBarComponentEvent = props =&gt; {
     } else if (props.bMesBill) {
  
       const btnName = sControlName.replace('BtnLeft.', '').replace('BtnRight.', '').toLowerCase();
-      let enabled =  props.enabled
+      let enabled = props.enabled
       if (props.enabled === undefined && !props?.parentProps?.record) {
         enabled = true
       }
@@ -840,7 +840,13 @@ const useCommonOperationBarComponentEvent = props =&gt; {
       style.color = "#000";
       defaultProps.style = style;
     }
-
+    if (config.btnBgColor) {
+      const { style = {} } = defaultProps;
+      style.backgroundColor = config.btnBgColor;
+      style.borderColor = config.btnBgColor;
+      style.color = "#fff";
+      defaultProps.style = style;
+    }
     return defaultProps;
   };
  
@@ -560,15 +560,20 @@ const ProductionExecContentByType = props =&gt; {
       )
         return;
       const { globalData } = props?.app
-      const {currentWorkOrderInfo} = globalData || {}
+      const { currentWorkOrderInfo } = globalData || {}
       const { dAdjustOrRun } = currentWorkOrderInfo || {}
-      const sStatusNameValue = dAdjustOrRun === 0
+      // const sStatusNameValue = dAdjustOrRun === 0
+      //   ? 0
+      //   : 1;
+      const sStatusNameValue = deviceTargetInfoData[0]?.sStatus?.includes(
+        "adjustment"
+      )
         ? 0
         : 1;
  
       const showValue = {
         stop: {
-          showName: "调机 / 生产",
+          showName: "调机开始",
           onClick: config =>
             operationFetch(props, config, undefined, () => {
               props.onSaveState({
@@ -578,7 +583,7 @@ const ProductionExecContentByType = props =&gt; {
             })
         },
         again: {
-          showName: "调机 / 生产",
+          showName: "调机结束",
           onClick: config =>
             operationFetch(props, config, "again", () => {
               props.onSaveState({