Merge branch 'dev-tmp1' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev-tmp1

src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.js

@@ -16,6 +16,7 @@ import {
   TreeSelect,
   Upload,
   Tag,
+  Tooltip,
   Divider
 } from "antd";
 import { InboxOutlined } from "@ant-design/icons";
@@ -314,7 +315,7 @@ function PersonnelInfoPage(props) {
           <Table
             rowKey="id"
             columns={[
-              { title: "姓名", dataIndex: "userName", ellipsis: true, width: 150 },
+              { title: "姓名", dataIndex: "userName", ellipsis: true, width: 90 },
               { title: "账号", dataIndex: "account" },
               { title: "部门", dataIndex: "deptName" },
               { title: "岗位", dataIndex: "postName" },
@@ -341,6 +342,19 @@ function PersonnelInfoPage(props) {
                   return <Space size={4}>{arr}</Space>;
                 },
               },
+              {
+                title: "状态",
+                dataIndex: "isCertComplete",
+                width: 100,
+                render: (val) =>
+                  val ? (
+                    <span className="cert-complete-tag complete">已完善</span>
+                  ) : (
+                    <Tooltip title="证书照片未上传">
+                      <span className="cert-complete-tag incomplete">未完善</span>
+                    </Tooltip>
+                  ),
+              },
               {
                 title: "操作",
                 width: 200,

src/pages/Container/EnterpriseInfo/PersonnelInfo/List/index.less

@@ -25,6 +25,17 @@
   min-width: 0;
 }
 
+.cert-complete-tag {
+  &.complete {
+    color: #52c41a;
+  }
+
+  &.incomplete {
+    color: #ff4d4f;
+    cursor: pointer;
+  }
+}
+
 .required-star {
   color: #ff4d4f;
   margin-right: 4px;