准入查看与零星采购/应急采购/个人供应商和个人修改

src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx

@@ -9,6 +9,12 @@ interface Data {
   coscoAccessSupplierList: coscoAccessSupplierLists[];
   coscoAccessCategoryList: coscoAccessCategoryLists[];
   coscoAccessUserls: coscoAccessUserl[];
+  coscoAccessWorkAttachments: coscoAccessWorkAttachments;
+}
+
+interface coscoAccessWorkAttachments {
+  fileName: string;
+  fileUrl: string;
 }
 interface coscoAccessUserl {
   deptId: string;
@@ -27,13 +33,15 @@ interface coscoAccessWorks {
   startTime: string;
   endTime: string;
   reviewStatusText: string;
+  accessType: string;
+  accessDesc: string;
 }
 
 const ViewModal: React.FC<{
   visible: boolean;
-  record?: string | null;
+  record?: any;
   onCancel: () => void;
-}> = ({ visible, record, onCancel }) => {
+}> = ({ visible, record = {}, onCancel }) => {
   //渲染数据
   const [data, setData] = useState<Data | null>(null);
   //初始化
@@ -60,23 +68,44 @@ const ViewModal: React.FC<{
               )
             })}
           </Descriptions.Item>
-          <Descriptions.Item label="申请准入品类">
-            {data.coscoAccessCategoryList.map((item) => {
-              return (
-                <div style={{ margin: '5px' }}>{item.categoryName}</div>
-              )
-            })}
-          </Descriptions.Item>
-          <Descriptions.Item label="评审开始时间">{data.coscoAccessWork.startTime}</Descriptions.Item>
-          <Descriptions.Item label="评审结束时间">{data.coscoAccessWork.endTime}</Descriptions.Item>
-          <Descriptions.Item label="评审专家">
-            {data.coscoAccessUserls.map((item) => {
-              return (
-                <div style={{ margin: '5px' }}>{item.deptId} - {item.userId}</div>
-              )
-            })}
-          </Descriptions.Item>
-          <Descriptions.Item label="审批结果">{data.coscoAccessWork.reviewStatusText}</Descriptions.Item>
+
+          {data.coscoAccessWork.accessType === 'scattered' && (
+            <>
+              <Descriptions.Item label="准入说明">{data.coscoAccessWork.accessDesc}</Descriptions.Item>
+              <Descriptions.Item label="附件">
+                <a href={data.coscoAccessWorkAttachments.fileUrl} target="_blank" rel="noreferrer">{data.coscoAccessWorkAttachments.fileName}</a>
+              </Descriptions.Item>
+            </>
+          )}
+          {data.coscoAccessWork.accessType === 'offline' && (
+              <Descriptions.Item label="供应商符合性审查">
+                  <a href={data.coscoAccessWorkAttachments.fileUrl} target="_blank" rel="noreferrer">{data.coscoAccessWorkAttachments.fileName}</a>
+              </Descriptions.Item>
+          )}
+
+
+          {data.coscoAccessWork.accessType === 'online' && (
+            <>
+              <Descriptions.Item label="申请准入品类">
+                {data.coscoAccessCategoryList.map((item) => {
+                  return (
+                    <div style={{ margin: '5px' }}>{item.categoryName}</div>
+                  )
+                })}
+              </Descriptions.Item>
+              <Descriptions.Item label="评审开始时间">{data.coscoAccessWork.startTime}</Descriptions.Item>
+              <Descriptions.Item label="评审结束时间">{data.coscoAccessWork.endTime}</Descriptions.Item>
+              <Descriptions.Item label="评审专家">
+                {data.coscoAccessUserls.map((item) => {
+                  return (
+                    <div style={{ margin: '5px' }}>{item.deptId} - {item.userId}</div>
+                  )
+                })}
+              </Descriptions.Item>
+              <Descriptions.Item label="审批结果">{data.coscoAccessWork.reviewStatusText}</Descriptions.Item>
+            </>
+          )}
+
         </Descriptions>
       )}
     </Modal>

src/pages/supplier/admission/SupplierEntryReview/index.tsx

@@ -23,24 +23,7 @@ interface ModalInfo {
   visible: boolean;
   record: string | null;
 }
-const statusColorMap: Record<string, string> = {
-  '未开始': 'default',
-  '进行中': 'processing',
-  '已完成': 'success',
-};
 
-const methodOptions = [
-  { label: '全部', value: '' },
-  { label: '线上准入', value: '线上准入' },
-  { label: '线下准入', value: '线下准入' },
-];
-
-const statusOptions = [
-  { label: '全部', value: '' },
-  { label: '未开始', value: '未开始' },
-  { label: '进行中', value: '进行中' },
-  { label: '已完成', value: '已完成' },
-];
 
 const deptOptions = [
   { label: '全部', value: '' },
@@ -142,22 +125,33 @@ const SupplierEntryReview: React.FC = () => {
       title: '准入方式',
       dataIndex: 'accessTypeText',
       align: 'center',
+      ellipsis: true,
     },
     {
       title: '准入品类',
-      dataIndex: 'categoryName',
+      dataIndex: 'categoryNameList',
       align: 'center',
-      ellipsis: true,
+      render: (_: any, record: any) => {
+        return (
+          <>
+            {record.categoryNameList.map((item:string) => {
+              return <div>{`${item}`}</div>
+            })}
+          </>
+        )
+      },
     },
     {
       title: '开始时间',
       dataIndex: 'startTime',
       align: 'center',
+      ellipsis: true,
     },
     {
       title: '结束时间',
       dataIndex: 'endTime',
       align: 'center',
+      ellipsis: true,
     },
     {
       title: '流程状态',
@@ -173,7 +167,6 @@ const SupplierEntryReview: React.FC = () => {
       title: '操作',
       width: 120,
       render: (_: any, record: any) => {
-        console.log(record, 'record');
         return (
           <Space>
             <a onClick={() => openModal(record.id)}>查看</a>
@@ -195,7 +188,7 @@ const SupplierEntryReview: React.FC = () => {
           <Select style={{ width: 150 }} placeholder="请选择准入方式" allowClear >
             <Option value="online">线上准入</Option>
             <Option value="offline">线下准入</Option>
-            <Option value="scattered">零星采购/应急采购</Option>
+            <Option value="scattered">零星采购/应急采购/个人供应商</Option>
           </Select>
         </Form.Item>
         <Form.Item name="deptId" label="准入部门">