工单信息展示

chenxt
1 parent 397c2fde
Showing 2 changed files with 106 additions and 101 deletions
src/components/Common/CommonTable/index.js
src/mes/common/siderInfoComponent/index.js
@@ -12460,7 +12460,7 @@ const useGetTableBtnOprSetting = props =&gt; {
                 // props.onMesTableLineDel && props.onMesTableLineDel(params);
                 const btnsConfig =
                   gdsconfigformslave.find(
-                    item => item.sControlName?.toLowerCase().includes("enventofftwork")
+                    item => item.sControlName?.toLowerCase().includes("enventmanualofftwork")
                   ) || {};
                 props.parentProps.onExecInstructSet({
                   btnConfig: {
@@ -633,110 +633,115 @@ const DeviceTargetInfoComponent = () =&gt; {
     };
   };
   const equipmentTargetInformation = commonFunc.showLocalMessage(props, 'equipmentTargetInformation', '设备及目标信息');
+  const { workOrderInfoData = [] } = props;
+  const sColumnConfig = JSON.parse(workOrderInfoData[0]?.sColumnConfig || '[]');
+  const [first] = sColumnConfig
+  const otherList = sColumnConfig.slice(1).filter(item => item.bVisible === 1);
+  const sNamesInArr2 = new Set(otherList.map(item => item.sName)); // 或 item.sname
+  const result = showConfig.filter(item => sNamesInArr2.has(item.sName)); // 或 item.sname
   return (
+
     <div className={styles.deviceTargetInfo}>
-      <div className="mesTitle" style={{ padding: "10px 10px 5px" }}>
-        <img src={iocnObj.facilityIcon} />
-        {equipmentTargetInformation}
-      </div>
-      {showConfig.map((config, index) => {
-
-
-        // if (index > 4) return "";
-        // bPushDiff
-        const { bPushDiff = false } = props?.app?.userinfo
-        const className = cx({
-          mesShowType: true,
-          odd: index % 2 === 0
-        });
-        const showTypeProps = handleGetShowTypeProps(config);
-        if (
-          ['dPieceDefectAQty', 'dPieceDefectBQty'].includes(config?.sName) &&
-          !bPushDiff
-        ) {
-          return null; // 不满足条件，不渲染
-        }
-        //   'dTotalAdjust', 'dSpeed'
-        if (config?.sName?.endsWith("Qty")) {
-          return (
-            <div className={`${className} dynamicClock`}>
-              <div className={styles.clock}>
-                <ClockComponent
-                  num={viewRow[config.sName]}
-                  sName={config.sName}
-                  {...props}
-                />
+        <div className="mesTitle" style={{ padding: "10px 10px 5px" }}>
+          <img src={iocnObj.facilityIcon} />
+          {first.showName}
+        </div>
+        {result.map((config, index) => {
+          // if (index > 4) return "";
+          // bPushDiff
+          const { bPushDiff = false } = props?.app?.userinfo
+          const className = cx({
+            mesShowType: true,
+            odd: index % 2 === 0
+          });
+          const showTypeProps = handleGetShowTypeProps(config);
+          // if (
+          //   ['dPieceDefectAQty', 'dPieceDefectBQty'].includes(config?.sName) &&
+          //   !bPushDiff
+          // ) {
+          //   return null; // 不满足条件，不渲染
+          // }
+          //   'dTotalAdjust', 'dSpeed'
+          if (config?.sName?.endsWith("Qty")) {
+            return (
+              <div className={`${className} dynamicClock`}>
+                <div className={styles.clock}>
+                  <ClockComponent
+                    num={viewRow[config.sName]}
+                    sName={config.sName}
+                    {...props}
+                  />
+                </div>
+                <Row style={{ flexWrap: "nowrap" }}>
+                  <Col flex={"160px"} className={styles.dynamicNumTitle}>
+                    {config.showName}：
+                  </Col>
+                  <Col
+                    flex={1}
+                    className={styles.dynamicNumContent}
+                    style={{ cursor: "not-allowed" }}
+                  >
+                    <div className={styles.mesDynamicNum}>
+                      <MesDynamicNum
+                        num={viewRow[config.sName]}
+                        sName={config.sName}
+                      />
+                    </div>
+                  </Col>
+                </Row>
               </div>
-              <Row style={{ flexWrap: "nowrap" }}>
-                <Col flex={"160px"} className={styles.dynamicNumTitle}>
-                  {config.showName}：
-                </Col>
-                <Col
-                  flex={1}
-                  className={styles.dynamicNumContent}
-                  style={{ cursor: "not-allowed" }}
-                >
-                  <div className={styles.mesDynamicNum}>
-                    <MesDynamicNum
-                      num={viewRow[config.sName]}
-                      sName={config.sName}
-                    />
-                  </div>
-                </Col>
-              </Row>
-            </div>
-          );
-        } else if (false && config.showName === "更新时间") {
-          return (
-            <div className={`${className}`}>
-              <Row style={{ flexWrap: "nowrap" }}>
-                <Col flex={"160px"} className={styles.dynamicNumTitle}>
-                  {config.showName}：
-                </Col>
-                <Col
-                  flex={1}
-                  className={styles.dynamicNumContent}
-                  style={{ cursor: "not-allowed" }}
-                >
-                  <div className={styles.mesDynamicNum}>
-                    <CurrentTimeComponent />
-                  </div>
-                </Col>
-              </Row>
-            </div>
-          );
-        } else if (config.showName === "设备状态") {
-          return (
-            <div className={className}>
-              <ShowType {...showTypeProps} />
-              <div className={styles.statusSetting}>
-                <Button
-                  type="link"
-                  size="large"
-                  id={settingId.current}
-                  onClick={() => {
-                    window.deviceTargetInfoModal = true;
-                    props.onTableBtnClick({
-                      name: "deviceTargetInfo",
-                      record: viewRow,
-                      config
-                    });
-                  }}
-                >
-                  设置
-                </Button>
+            );
+          } else if (false && config.showName === "更新时间") {
+            return (
+              <div className={`${className}`}>
+                <Row style={{ flexWrap: "nowrap" }}>
+                  <Col flex={"160px"} className={styles.dynamicNumTitle}>
+                    {config.showName}：
+                  </Col>
+                  <Col
+                    flex={1}
+                    className={styles.dynamicNumContent}
+                    style={{ cursor: "not-allowed" }}
+                  >
+                    <div className={styles.mesDynamicNum}>
+                      <CurrentTimeComponent />
+                    </div>
+                  </Col>
+                </Row>
               </div>
-            </div>
-          );
-        } else {
-          return (
-            <div className={className}>
-              <ShowType {...showTypeProps} />
-            </div>
-          );
-        }
-      })}
-    </div>
+            );
+          } else if (config.showName === "设备状态") {
+            return (
+              <div className={className}>
+                <ShowType {...showTypeProps} />
+                <div className={styles.statusSetting}>
+                  <Button
+                    type="link"
+                    size="large"
+                    id={settingId.current}
+                    onClick={() => {
+                      window.deviceTargetInfoModal = true;
+                      props.onTableBtnClick({
+                        name: "deviceTargetInfo",
+                        record: viewRow,
+                        config
+                      });
+                    }}
+                  >
+                    设置
+                  </Button>
+                </div>
+              </div>
+            );
+          } else {
+            return (
+              <div className={className}>
+                <ShowType {...showTypeProps} />
+              </div>
+            );
+          }
+        })}
+      </div>
   );
 };