送审关注

src/view/Manage/Model/Component/ImportActionTable.jsx

@@ -412,23 +412,6 @@ export const ImportActionTable = (props) => {
       }
     },
     {
-      title: '重点关注',
-      width: 80,
-      dataIndex: 'needAttention',
-      editable: false,
-      render: (needAttention, record, index) => {
-        if (!needAttention) {
-          return '-'; 
-        } else if (needAttention === true) {
-          return (
-            <CheckOutlined />
-          )
-        }
-
-        return '';
-      }
-    },
-    {
       title: '业务含义',
       dataIndex: 'remark',
       editable: true,
@@ -495,10 +478,20 @@ export const ImportActionTable = (props) => {
           </React.Fragment>
         )
       }
-    },
+    }
   ];
 
-  const [ columns, setColumns ] = useState(cols);
+  const attentionCol = {
+    title: '送审关注',
+    width: 80,
+    dataIndex: 'needAttention',
+    editable: false,
+    render: (_, record, index) => (
+      record.needAttention ? <AttentionSvg style={{ width: 15, height: 15 }} /> : <UnAttentionSvg style={{ width: 15, height: 15 }} />
+    )
+  }
+
+  const [ columns, setColumns ] = useState([]);
 
   useClickAway(() => {
     save();
@@ -977,9 +970,11 @@ export const ImportActionTable = (props) => {
         };
       });
 
-      setColumns(_columns);
+      //只在编辑和评审的时候显示送审关注
+      setColumns((originAction === 'flow'||action === 'edit')?[..._columns, attentionCol]:_columns);
     } else {
-      setColumns(cols);
+      //只在编辑和评审的时候显示送审关注
+      setColumns((originAction === 'flow'||action === 'edit')?[...cols, attentionCol]:cols);
     }
   }
 

src/view/Manage/ModelReview/index.jsx

@@ -5,7 +5,6 @@ import produce from "immer"
 import Table from '../../../util/Component/Table'
 import { isSzseEnv, getQueryParam, showMessage } from "../../../util"
 import { dispatch } from '../../../model'; 
-import { AttachesItem } from "../Model/Component/start-flow"
 import { Action, ApprovalId, ApprovalType, ModelerId } from "../../../util/constant"
 
 const FC = (props) => {