Commit 92c28c1dbc239b53358df43948d93fb64f0b8ec3

Authored by chenxt
1 parent fb9e988c

扫脸走指令集

Showing 1 changed file with 18 additions and 5 deletions
src/mes/teamInfo/index.js
@@ -579,7 +579,7 @@ const TeamInfo = baseProps => { @@ -579,7 +579,7 @@ const TeamInfo = baseProps => {
579 } 579 }
580 }); 580 });
581 } 581 }
582 - const {sMachineNameStr} = props?.app || {} 582 + const { sMachineNameStr } = props?.app || {}
583 const isSMachineNameStr = sMachineNameStr && sMachineNameStr.includes('礼盒') 583 const isSMachineNameStr = sMachineNameStr && sMachineNameStr.includes('礼盒')
584 return ( 584 return (
585 <div className={styles.teamInfo}> 585 <div className={styles.teamInfo}>
@@ -632,7 +632,20 @@ const TeamInfo = baseProps =&gt; { @@ -632,7 +632,20 @@ const TeamInfo = baseProps =&gt; {
632 if (props.masterData && !props.masterData.length) { 632 if (props.masterData && !props.masterData.length) {
633 return message.warning('请先添加一条班组信息!') 633 return message.warning('请先添加一条班组信息!')
634 } 634 }
635 - setFaceModal(true); 635 + // setFaceModal(true);
  636 + const btnsConfig =
  637 + bManualSlaveTableProps?.config?.gdsconfigformslave.find(
  638 + item => item.sControlName?.toLowerCase().includes("btnenventinsertwork")
  639 + ) || {};
  640 + props.onExecInstructSet({
  641 + btnConfig: {
  642 + ...btnsConfig,
  643 + sInstruct: btnsConfig.sInstruct
  644 + },
  645 + nextProps: {
  646 + ...props,
  647 + }
  648 + });
636 }} 649 }}
637 650
638 > 651 >
@@ -776,7 +789,7 @@ const TeamInfo = baseProps =&gt; { @@ -776,7 +789,7 @@ const TeamInfo = baseProps =&gt; {
776 </div> 789 </div>
777 <div className="postList"> 790 <div className="postList">
778 <Spin spinning={props.loadings} delay={500}> 791 <Spin spinning={props.loadings} delay={500}>
779 - <StaticEditTable {...tableProps} fixedHeight={isSMachineNameStr?300:130} /> 792 + <StaticEditTable {...tableProps} fixedHeight={isSMachineNameStr ? 300 : 130} />
780 <CommonOperationBarComponent {...operationBarProps} /> 793 <CommonOperationBarComponent {...operationBarProps} />
781 </Spin> 794 </Spin>
782 </div> 795 </div>
@@ -873,7 +886,7 @@ const TeamJoinInfo = props =&gt; { @@ -873,7 +886,7 @@ const TeamJoinInfo = props =&gt; {
873 }) 886 })
874 ) 887 )
875 ?.filter(item => item.tableName !== "slave3"); 888 ?.filter(item => item.tableName !== "slave3");
876 - const {sMachineNameStr} = props?.app || {} 889 + const { sMachineNameStr } = props?.app || {}
877 const isSMachineNameStr = sMachineNameStr && sMachineNameStr.includes('礼盒') 890 const isSMachineNameStr = sMachineNameStr && sMachineNameStr.includes('礼盒')
878 const tableProps = tableName => { 891 const tableProps = tableName => {
879 const result = { 892 const result = {
@@ -882,7 +895,7 @@ const TeamJoinInfo = props =&gt; { @@ -882,7 +895,7 @@ const TeamJoinInfo = props =&gt; {
882 onChange: () => { } 895 onChange: () => { }
883 }, 896 },
884 onTableBtnClick: props.onTableBtnClick, 897 onTableBtnClick: props.onTableBtnClick,
885 - fixedHeight: isSMachineNameStr? (tableName === "slave4" ? "100px" : "80px") : tableName === "slave4" ? "230px" : "160px" 898 + fixedHeight: isSMachineNameStr ? (tableName === "slave4" ? "100px" : "80px") : tableName === "slave4" ? "230px" : "160px"
886 }; 899 };
887 900
888 result.tableBtnsConfig = result.config?.gdsconfigformslave 901 result.tableBtnsConfig = result.config?.gdsconfigformslave