按钮样式

chenxt
1 parent 8926399f
Showing 7 changed files with 139 additions and 48 deletions
src/components/Common/CommonInstructSet.js
src/mes/common/commonModelComponent/index.js
src/mes/common/commonOperationBarComponent/MesToolbar.js
src/mes/productionExec/productionExecMain/index.js
src/mes/productionExec/productionExecMain/index.less
src/mes/teamInfo/index.js
src/oee/common/oeeKeyBoard.js
@@ -147,7 +147,7 @@ const addExtraData = props =&gt; {
       }
     });
   }
-
+  
   const globalData = commonUtils.convertStrToObj(
     localStorage.xlybusinessglobalData
   );
@@ -226,7 +226,6 @@ const instructSetInit = async props =&gt; {
  
   // 基础校验
   const sInstruct = instructCheck(props);
-
   if (!sInstruct) return;
  
   // 添加额外数据
@@ -337,6 +336,7 @@ const instructSetInit = async props =&gt; {
       props.callback && props.callback();
     });
   });
+  
   props.inscallback && props.inscallback({ ...props, ...addStateNew });
 };
  
@@ -1306,6 +1306,7 @@ const CommonModelComponent = props =&gt; {
         tableBtnsConfig, // 表格按钮配置
         bFirstComponent: level === 0 && index === -1
       };
+      console.log("🚀 ~ getComponent ~ componentProps:", componentProps)
       const commonDivHeight = useComputedCommonDivHeight(componentProps);
       return (
         <div
@@ -1874,8 +1875,6 @@ const CommonTableComponent = props =&gt; {
     sName
   };
   if (tableProps.data && tableProps.data.length === 0) {
-    console.log("🚀 ~ CommonTableComponent ~ tableProps:", tableProps)
-
     props.onMesTableLineAdd({
       tableName: tableProps.name,
       // tableClassName: state.tableClassName
@@ -132,7 +132,6 @@ const handleScanFace = (props) =&gt; {
         onSuccess: (_, dataset) => {
           const { proData = [] } = dataset.rows[0].dataSet;
           const { [`${addData}Data`]: tableData = [], [`${addData}Config`]: config = {} } = props;
-          const { btnConfig = {}, copyToConfig = [], record = {} } = props?.parentProps || {}
           const copyConfig = config?.gdsconfigformslave?.find(item => item.sControlName.toLowerCase().includes('btnscanface'))
           proData.forEach(item => {
           const data = commonFunc.getAssignFieldValue(copyConfig?.sAssignField, item)
@@ -37,7 +37,7 @@ const list = [
  
 const useProductionExecMainEvent = props => {
   const { formData = [] } = props;
-  const noProduction= commonFunc.showLocalMessage(props, 'noProduction', '暂无生产执行数据，请先开工一条任务!');
+  const noProduction = commonFunc.showLocalMessage(props, 'noProduction', '暂无生产执行数据，请先开工一条任务!');
  
   const waitWorkLoading = commonFunc.showLocalMessage(props, 'waitWorkLoading', '等待工单数据加载中...');
  
@@ -452,9 +452,8 @@ const ProductionExecMain = baseProps =&gt; {
       <div className={`rightPanel ${collapsed ? "collapsed" : ""}`}>
         {props.pageloading ? (
           <div
-            className={`mesPageloadingDiv ${
-              props.bNoWorkOrderInfo ? "hideDot" : ""
-            }`}
+            className={`mesPageloadingDiv ${props.bNoWorkOrderInfo ? "hideDot" : ""
+              }`}
           >
             <Spin
               spinning={props.pageloading}
@@ -525,9 +524,8 @@ const ProductionExecMain = baseProps =&gt; {
         onClick={() => {
           setCollapsed(!collapsed);
         }}
-        className={`btns ${styles.expandCutBtn} ${
-          collapsed ? "collapsed" : ""
-        }`}
+        className={`btns ${styles.expandCutBtn} ${collapsed ? "collapsed" : ""
+          }`}
         style={{ display: !props.bFinish1 ? "none" : "" }}
       >
         <Button
@@ -729,8 +727,8 @@ const ProductionExecContent = props =&gt; {
             onSuccess: () => {
               props.onRefresh && props.onRefresh();
             },
-            onConfirm: () => {},
-            onError: () => {}
+            onConfirm: () => { },
+            onError: () => { }
           });
           return;
         }
@@ -978,7 +976,7 @@ const ProductionExecContent0 = props =&gt; {
   const btnProps = {
     type: "primary",
     size: "large",
-    style: { width: 80 }
+    style: { width: 100, height: 40 }
   };
  
   const getBtnConfigByControlName = sControlName => {
@@ -986,9 +984,9 @@ const ProductionExecContent0 = props =&gt; {
       config.gdsconfigformslave.find(
         item => item.sControlName === sControlName
       ) || {};
-      if (!btnConfig.bVisible) {
-        btnConfig.style = { display: "none" };
-      }
+    if (!btnConfig.bVisible) {
+      btnConfig.style = { display: "none" };
+    }
     return {
       ...btnConfig,
       disabled: props.onGetBtnStatus(tableName, btnConfig),
@@ -1016,8 +1014,8 @@ const ProductionExecContent0 = props =&gt; {
             onSuccess: () => {
               props.onRefresh && props.onRefresh();
             },
-            onConfirm: () => {},
-            onError: () => {}
+            onConfirm: () => { },
+            onError: () => { }
           });
           return;
         }
@@ -1027,7 +1025,7 @@ const ProductionExecContent0 = props =&gt; {
           record: viewRow,
           config: btnConfig
         });
-      }
+      },
     };
   };
  
@@ -1080,6 +1078,100 @@ const ProductionExecContent0 = props =&gt; {
             <CommonViewTable className="rightFormBox" {...viewProps} />
             <div className="rightFormBtn">
               <div className="rightFormBtnFloor">
+                <div className='rightFormBtnFloorBtnBox'>
+                  <Button
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnEventBlanking")}
+                  >
+                    下料
+                  </Button>
+                  <Button
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnEventJL")}
+                  >
+                    叫料
+                  </Button>
+                  <Button
+                    className="abnormalBtn"
+                    style={{ "border-color": "#faad14", background: "#faad14" }}
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnCancel")}
+                  >
+                    撤销
+                  </Button>
+                  {[""].map(() => {
+                    const sControlName = "BtnRight1.BtnPrint4";
+                    const btnConfig = config.gdsconfigformslave.find(
+                      item => item.sControlName === sControlName
+                    );
+                    if (!btnConfig) return "";
+                    return (
+                      <Button
+                        {...btnProps}
+                        {...getBtnConfigByControlName(sControlName)}
+                      >
+                        {btnConfig.showName}
+                      </Button>
+                    );
+                  })}
+                  <Button
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnPrint1")}
+                  >
+                    产量①
+                  </Button>
+                  <Button
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnPrint2")}
+                  >
+                    产品②
+                  </Button>
+                  <Button
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnPrint3")}
+                  >
+                    异常③
+                  </Button>
+                </div>
+                {/* <Space>
+                  <Button
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnPrint1")}
+                  >
+                    产量①
+                  </Button>
+                  <Button
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnPrint2")}
+                  >
+                    产品②
+                  </Button>
+                </Space> */}
+                {/* <Space className="rightPart">
+                  <Button
+                    {...btnProps}
+                    {...getBtnConfigByControlName("BtnPrint3")}
+                  >
+                    异常③
+                  </Button>
+                </Space> */}
+              </div>
+              <div className="rightFormBtnFoot pagesNuxt">
+                <Button
+                  onClick={() => props.onPagesNuxt(tableName, "up")}
+                  icon={<LeftOutlined />}
+                  {...btnProps}
+                />
+                <Button
+                  onClick={() => props.onPagesNuxt(tableName, "next")}
+                  icon={<RightOutlined />}
+                  {...btnProps}
+                />
+
+              </div>
+            </div>
+            {/* <div className="rightFormBtn">
+              <div className="rightFormBtnFloor">
                 <Space>
                   <Button
                     {...btnProps}
@@ -1115,7 +1207,6 @@ const ProductionExecContent0 = props =&gt; {
                   >
                     产品②
                   </Button>
-                  {/* <Button {...btnProps}>产品②</Button> */}
                 </Space>
               </div>
               <div className="rightFormBtnFloor">
@@ -1129,7 +1220,6 @@ const ProductionExecContent0 = props =&gt; {
                   >
                     异常③
                   </Button>
-                  {/* <Button {...btnProps}>撤销</Button> */}
                 </Space>
               </div>
               <div className="rightFormBtnFoot pagesNuxt">
@@ -1161,7 +1251,7 @@ const ProductionExecContent0 = props =&gt; {
                   );
                 })}
               </div>
-            </div>
+            </div> */}
           </div>
         </div>
         <div className="btns">
@@ -1323,8 +1413,8 @@ const ProductionExecContent1 = props =&gt; {
             onSuccess: () => {
               props.onRefresh && props.onRefresh();
             },
-            onConfirm: () => {},
-            onError: () => {}
+            onConfirm: () => { },
+            onError: () => { }
           });
           return;
         }
@@ -1589,8 +1679,8 @@ const ProductionExecContent2 = props =&gt; {
             onSuccess: () => {
               props.onRefresh && props.onRefresh();
             },
-            onConfirm: () => {},
-            onError: () => {}
+            onConfirm: () => { },
+            onError: () => { }
           });
           return;
         }
@@ -1777,17 +1867,15 @@ const ProductionExecContent3 = props =&gt; {
         const bXialiao = filterData?.[0]?.iJobStatus === 3;
         return (
           <div
-            className={`${
-              index < currentStep - 1
-                ? styles.stepState1
-                : index === currentStep - 1
-                  ? bXialiao
-                    ? styles.stepState1
-                    : styles.stepState2
-                  : ""
-            } ${
-              currentSelectedStep === index + 1 ? styles.stepStateUnderline : ""
-            } `}
+            className={`${index < currentStep - 1
+              ? styles.stepState1
+              : index === currentStep - 1
+                ? bXialiao
+                  ? styles.stepState1
+                  : styles.stepState2
+                : ""
+              } ${currentSelectedStep === index + 1 ? styles.stepStateUnderline : ""
+              } `}
             onClick={() => {
               if (index <= currentStep - 1) {
                 setCurrentSelectedStep(index + 1);
@@ -1996,8 +2084,8 @@ const ProductionExecContent8 = props =&gt; {
             onSuccess: () => {
               props.onRefresh && props.onRefresh();
             },
-            onConfirm: () => {},
-            onError: () => {}
+            onConfirm: () => { },
+            onError: () => { }
           });
           return;
         }
@@ -2252,8 +2340,8 @@ const ProductionExecContent10 = props =&gt; {
             onSuccess: () => {
               props.onRefresh && props.onRefresh();
             },
-            onConfirm: () => {},
-            onError: () => {}
+            onConfirm: () => { },
+            onError: () => { }
           });
           return;
         }
@@ -2379,7 +2467,7 @@ const ProductionExecContent10 = props =&gt; {
                       {...btnProps}
                       {...getBtnConfigByControlName(sControlName)}
                       className={`${styles.print4} print4`}
-                      // style={{display: 'none'}}
+                    // style={{display: 'none'}}
                     >
                       打印标条
                       {/* {btnConfig.showName} */}
@@ -133,7 +133,13 @@
         .flex(center);
         justify-content: space-between;
         padding: 0 5px;
-
+        width: 100%;
+        .rightFormBtnFloorBtnBox{
+          width: 100%;
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+        }
         .abnormalBtn {
           border-color: #faad14;
           background: #faad14;
@@ -484,7 +484,6 @@ const TeamInfo = baseProps =&gt; {
  
   const { sForemanName = "", sIpqcName = "", sEmployeeName = "" } =
     props.slaveData && props.slaveData.length !== 0 ? props.slaveData[0] : {};
-
   const { sTeamEmployeeNo = "" } = props.slave0Data?.[0] || {};
  
   const foremanConfig = props.slaveConfig?.gdsconfigformslave.find(item => item.sName === 'sForemanName') || {};
@@ -308,8 +308,8 @@ class VK extends React.Component {
           borderRadius: 8,
           userSelect: 'none',
         }}
-        onMouseDown={this.F_MouseDown}
-        onTouchStart={this.F_TouchStart}
+        // onMouseDown={this.F_MouseDown}
+        // onTouchStart={this.F_TouchStart}
         // onBlur={this.F_Close}
       >
         <div id="VK_Title" style={{ fontSize: 14, margin: 5, textAlign: 'right' }}>可以拖动移开或 <button style={{ borderRadius: 6, border: '1px dotted #333' }} onClick={this.F_Close}>关闭键盘</button></div>