From 48f1c50a26cfcf3997e1966c7c847e1d84775939 Mon Sep 17 00:00:00 2001
From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Fri, 26 Dec 2025 15:42:23 +0800
Subject: [PATCH] 增加审核标识

---
 src/mes/common/commonModelComponent/index.js        | 12 ++++++++++--
 src/mes/common/commonModelComponent/index.less      | 11 ++++++++++-
 src/mes/common/commonOperationBarComponent/index.js |  9 +++++----
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js
index 4a37913..0d968c1 100644
--- a/src/mes/common/commonModelComponent/index.js
+++ b/src/mes/common/commonModelComponent/index.js
@@ -2,7 +2,7 @@
 import React, { useEffect, useRef, useState } from "react";
 import moment from "moment";
 import { cloneDeep } from "lodash";
-import { Tabs, Modal, Space, Button, DatePicker, Radio, message } from "antd";
+import { Tabs, Modal, Space, Button, DatePicker, Radio, message , Avatar} from "antd";
 import * as commonUtils from "@/utils/utils";
 import * as commonConfig from "@/utils/config";
 import * as commonServices from "@/services/services";
@@ -1587,7 +1587,7 @@ const CommonModel = baseProps => {
 };
 
 const CommonModelComponent = props => {
-  const { tabConfig = [], level, modelStyle, app, bMesBill, enabled } = props;
+  const { tabConfig = [], level, modelStyle, app, bMesBill, enabled ,masterData, sModelsType} = props;
   const { userinfo } = app;
   const sLanguage = userinfo.sLanguage;
   const getComponent = (config, index = 0) => {
@@ -1605,6 +1605,8 @@ const CommonModelComponent = props => {
       if (!children.length) return "";
       const footerComponent = useFooterComponent({ ...props, sTabName });
       const modelStyle = footerComponent ? { height: "calc(100% - 50px)" } : {};
+  
+
       return (
         <>
           <CommonModelComponent
@@ -1938,6 +1940,9 @@ const CommonViewTableComponent = props => {
     sName,
     belongsToForm: true,
   };
+  const {masterData, sModelsType, app} = props
+  const {bCheck} = masterData
+  const imgSrc = commonBusiness.handleAddIcon(masterData, sModelsType, app);
   return (
     <>
       {sName === "master" ? (
@@ -1973,6 +1978,9 @@ const CommonViewTableComponent = props => {
       ) : (
         ""
       )}
+      {
+        bCheck ? <div className={styles.bShow}><Avatar src={imgSrc} /></div> : ''
+      }
     </>
   );
 };
diff --git a/src/mes/common/commonModelComponent/index.less b/src/mes/common/commonModelComponent/index.less
index c135b40..1f492cc 100644
--- a/src/mes/common/commonModelComponent/index.less
+++ b/src/mes/common/commonModelComponent/index.less
@@ -53,7 +53,16 @@
     }
   }
 }
-
+.bShow>span>img {
+  position: fixed;
+  width: 93px;
+  height: 93px;
+  right: 0px;
+  z-index: 999;
+  top: 122px;
+  /* 解决审核图标挡住操作按钮 */
+  object-fit: contain;
+}
 .commonFooter {
   .size(100%, 50px);
   .flex(center, flex-end);
diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js
index 26ff3f9..79b1c38 100644
--- a/src/mes/common/commonOperationBarComponent/index.js
+++ b/src/mes/common/commonOperationBarComponent/index.js
@@ -737,10 +737,8 @@ const useCommonOperationBarComponentEvent = props => {
         console.log("=====err", { tempData, str: sDefault, strNew, error });
       }
     } else if (props.bMesBill) {
-      
-      const btnName = sControlName.replace('BtnLeft.', '').replace('BtnRight.', '').toLowerCase();
-        console.log(btnName,props, 'btnName');
 
+      const btnName = sControlName.replace('BtnLeft.', '').replace('BtnRight.', '').toLowerCase();
       if (props.enabled) {
         if (["btnupd", 'btnevent', 'btnsubmit', 'btnsubmitcancel', 'btnexamine', 'btncancelexamine'].includes(btnName)) {
           defaultProps.disabled = true;
@@ -764,7 +762,10 @@ const useCommonOperationBarComponentEvent = props => {
             defaultProps.disabled = true;
           }
         } else {
-          if (["btnexamine"].includes(btnName)) {
+          // if (["btnexamine"].includes(btnName)) {
+          //   defaultProps.disabled = true;
+          // }
+          if (["btnupd", 'btnevent', 'btnsubmit', 'btnsubmitcancel', 'btnexamine', "btncancel", "btndel"].includes(btnName)) {
             defaultProps.disabled = true;
           }
         }
--
libgit2 0.22.2