Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev

src/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics.tsx

@@ -32,7 +32,6 @@ const SupplierAnnualStatistics: React.FC = () => {
   const [searchParams, setSearchParams] =
     useState<DataStatistics.AnnualReviewStatisticsSearchParams>({});
 
-
   // 年审结果选项
   const annualResultOptions = Object.entries(AnnualReviewResultText).map(([key, value]) => ({
     label: value,
@@ -140,23 +139,40 @@ const SupplierAnnualStatistics: React.FC = () => {
     },
     {
       title: intl.formatMessage({ id: 'dataStatistics.common.accessUnit' }),
-      dataIndex: 'accessUnit',
-      key: 'accessUnit',
+      dataIndex: 'orgNameList',
+      key: 'orgNameList',
       width: 180,
       ellipsis: {
         showTitle: false,
       },
-      render: (text: string) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
+      render: (orgNameList: supplierAnnualTaskManage.SupplierOrgNameList[]) => (
+        <>
+          {orgNameList && orgNameList.length > 0 ? (
+            <Tooltip placement="topLeft" title={orgNameList.map((item) => item.orgName).join(',')}>
+              {orgNameList[0].orgName}
             </Tooltip>
+          ) : (
+            '-'
+          )}
+        </>
       ),
     },
     {
       title: intl.formatMessage({ id: 'dataStatistics.common.accessDept' }),
-      dataIndex: 'accessDept',
-      key: 'accessDept',
+      dataIndex: 'orgNameList',
+      key: 'orgNameList',
       width: 120,
+      render: (orgNameList: supplierAnnualTaskManage.SupplierOrgNameList[]) => (
+        <>
+          {orgNameList && orgNameList.length > 0 ? (
+            <Tooltip placement="topLeft" title={orgNameList.map((item) => item.deptName).join(',')}>
+              {orgNameList[0].deptName}
+            </Tooltip>
+          ) : (
+            '-'
+          )}
+        </>
+      ),
     },
     {
       title: intl.formatMessage({ id: 'dataStatistics.common.year' }),
@@ -170,7 +186,7 @@ const SupplierAnnualStatistics: React.FC = () => {
       title: intl.formatMessage({ id: 'dataStatistics.annual.annualStatisticsResult' }),
       dataIndex: 'annualStatisticsResult',
       key: 'annualStatisticsResult',
-      width: 100
+      width: 100,
     },
   ];
 

src/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics.tsx

@@ -158,23 +158,40 @@ const SupplierEvaluateStatistics: React.FC = () => {
     },
     {
       title: intl.formatMessage({ id: 'dataStatistics.common.accessUnit' }),
-      dataIndex: 'accessUnit',
-      key: 'accessUnit',
+      dataIndex: 'orgNameList',
+      key: 'orgNameList',
       width: 180,
       ellipsis: {
         showTitle: false,
       },
-      render: (text: string) => (
-        <Tooltip placement="topLeft" title={text}>
-          {text}
+     render: (orgNameList: SupplierTaskManage.SupplierOrgNameList[]) => (
+        <>
+          {orgNameList && orgNameList.length > 0 ? (
+            <Tooltip placement="topLeft" title={orgNameList.map((item) => item.orgName).join(',')}>
+              {orgNameList[0].orgName}
             </Tooltip>
+          ) : (
+            '-'
+          )}
+        </>
       ),
     },
     {
       title: intl.formatMessage({ id: 'dataStatistics.common.accessDept' }),
-      dataIndex: 'accessDept',
-      key: 'accessDept',
+      dataIndex: 'orgNameList',
+      key: 'orgNameList',
       width: 120,
+      render: (orgNameList: SupplierTaskManage.SupplierOrgNameList[]) => (
+        <>
+          {orgNameList && orgNameList.length > 0 ? (
+            <Tooltip placement="topLeft" title={orgNameList.map((item) => item.deptName).join(',')}>
+              {orgNameList[0].deptName}
+            </Tooltip>
+          ) : (
+            '-'
+          )}
+        </>
+      ),
     },
     {
       title: intl.formatMessage({ id: 'dataStatistics.evaluate.evaluateYear' }),

src/servers/dao/supplierAnnualManage/supplierAnnualTaskManage.d.ts

@@ -47,8 +47,12 @@ declare namespace supplierAnnualTaskManage {
   }
   // 供应商的组织
   interface SupplierOrgNameList {
+    // 准入部门
     deptId: string;
     deptName: string;
+    // 准入单位
+    orgName: string;
+    orgId: string;
   }
   // 列表响应
   interface TaskListResponse {

src/servers/dao/supplierEvaluateManage/supplierTaskManage.d.ts

@@ -256,8 +256,12 @@ declare namespace SupplierTaskManage {
   }
   // 供应商的组织
   interface SupplierOrgNameList {
+    // 准入部门
     deptId: string;
     deptName: string;
+    // 准入单位
+    orgName: string;
+    orgId: string;
   }
   /**
    * 品类树响应