问题修改

2025-07-15 13:21:10 +08:00
parent d96ae2059f
commit 5ccbe03a2d
16 changed files with 140 additions and 84 deletions
--- a/src/pages/supplier/admission/SupplierCategoryEntry/components/SupplierSelector.tsx
+++ b/src/pages/supplier/admission/SupplierCategoryEntry/components/SupplierSelector.tsx
@ -71,12 +71,14 @@ const SupplierSelector: React.FC<{ visible: boolean; onCancel: () => void; onSel
  }, [visible])
  //供应商名称
  const columns = [
-    { title: '供应商名称', dataIndex: 'name',  ellipsis: true,   width: 160, render: (name: string) => (
-      <Tooltip placement="topLeft" title={name}>
-        {name}
-      </Tooltip>
-    ), },
-    { title: '境内/境外', dataIndex: 'supplierType', render: (supplierType: string) =>  supplierType === 'dvs' ? '境内' : '境外'},
+    { title: '供应商名称', dataIndex: 'name',  ellipsis: true,  width: 160,  render: (_: any, record: any) => {
+         const name = record.supplierType === "ovs"? record.nameEn : record.name;
+         return( 
+         <Tooltip placement="topLeft" title={name}>
+           {name}
+         </Tooltip>)
+       } },
+       { title: '统一社会信用代码/税号', ellipsis: true, dataIndex: 'unifiedCode' },
  ];
  return (
    <Modal title="选择供应商" visible={visible} onCancel={onCancel} footer={null} width="80%">
--- a/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx
+++ b/src/pages/supplier/admission/SupplierCategoryEntry/components/ViewModal.tsx
@ -21,6 +21,7 @@ interface coscoAccessSupplierLists {
 interface coscoAccessWorks {
  deptId: string;
  reviewStatusText: string;
+  approveStatusText: string;
 }

 const ViewModal: React.FC<{
@ -62,7 +63,7 @@ const ViewModal: React.FC<{
            })}
          </Descriptions.Item>
          
-          <Descriptions.Item label="审批结果">{data.coscoAccessWork.reviewStatusText}</Descriptions.Item>
+          <Descriptions.Item label="审批结果">{data.coscoAccessWork.approveStatusText}</Descriptions.Item>
        </Descriptions>
      )}
    </Modal>
--- a/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx
+++ b/src/pages/supplier/admission/SupplierCategoryEntryReview/components/ViewModal.tsx
@ -21,6 +21,7 @@ interface coscoAccessSupplierLists {
 interface coscoAccessWorks {
  deptId: string;
  reviewStatusText: string;
+  approveStatusText: string;
 }

 const ViewModal: React.FC<{
@ -62,7 +63,7 @@ const ViewModal: React.FC<{
            })}
          </Descriptions.Item>
          
-          <Descriptions.Item label="审批结果">{data.coscoAccessWork.reviewStatusText}</Descriptions.Item>
+          <Descriptions.Item label="审批结果">{data.coscoAccessWork.approveStatusText}</Descriptions.Item>
        </Descriptions>
      )}
    </Modal>
--- a/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx
+++ b/src/pages/supplier/admission/SupplierEntryReview/components/ViewModal.tsx
@ -35,6 +35,7 @@ interface coscoAccessWorks {
  reviewStatusText: string;
  accessType: string;
  accessDesc: string;
+  approveStatusText: string;
 }

 const ViewModal: React.FC<{
@ -102,7 +103,7 @@ const ViewModal: React.FC<{
                  )
                })}
              </Descriptions.Item>
-              <Descriptions.Item label="审批结果">{data.coscoAccessWork.reviewStatusText}</Descriptions.Item>
+              <Descriptions.Item label="审批结果">{data.coscoAccessWork.approveStatusText}</Descriptions.Item>
            </>
          )}

--- a/src/pages/supplier/admission/admissionManagement/components/CreateModal.tsx
+++ b/src/pages/supplier/admission/admissionManagement/components/CreateModal.tsx
@ -328,6 +328,7 @@ const CreateModal: React.FC<{ visible: boolean; onCancel: () => void; }> = ({ vi
                        <Form.Item
                            label="供应商符合性审查"
                            name="supplierCompliance"
+                            required
                            rules={[
                                {
                                    validator: (_, value) => {
--- a/src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx
+++ b/src/pages/supplier/admission/admissionManagement/components/ReviewerSelector.tsx
@ -25,6 +25,19 @@ interface ReviewerSelectorProps {
  leader?: string;         // 回显：组长userId
 }

+
+function orgIdAndDeptId(data:any) {
+  const sss = data.map((item:any) => {
+    return {
+      ...item,
+      deptId: item.orgId
+    }
+  })
+
+  return sss
+  
+}
+
 const ReviewerSelector: React.FC<ReviewerSelectorProps> = ({
  visible,
  onCancel,
@ -63,7 +76,7 @@ const ReviewerSelector: React.FC<ReviewerSelectorProps> = ({
      .then((res) => {
        const { code, data } = res;
        if(code == 200) {
-          setData(data.records);
+          setData(orgIdAndDeptId(data.records));
          setTotal(data.total);
        }
      })
--- a/src/pages/supplier/admission/admissionManagement/components/SupplierSelector.tsx
+++ b/src/pages/supplier/admission/admissionManagement/components/SupplierSelector.tsx
@ -70,12 +70,14 @@ const SupplierSelector: React.FC<{ visible: boolean; onCancel: () => void; onSel
  }, [visible])
  //供应商名称
  const columns = [
-    { title: '供应商名称', dataIndex: 'name',  ellipsis: true,  width: 160,  render: (name: string) => (
+    { title: '供应商名称', dataIndex: 'name',  ellipsis: true,  width: 160,  render: (_: any, record: any) => {
+      const name = record.supplierType === "ovs"? record.nameEn : record.name;
+      return( 
      <Tooltip placement="topLeft" title={name}>
        {name}
-      </Tooltip>
-    ), },
-    { title: '境内/境外', dataIndex: 'supplierType', render: (supplierType: string) =>  supplierType === 'dvs' ? '境内' : '境外'},
+      </Tooltip>)
+    } },
+    { title: '统一社会信用代码/税号', ellipsis: true, dataIndex: 'unifiedCode' },
  ];
  return (
    <Modal title="选择供应商" visible={visible} onCancel={onCancel} footer={null} width="80%">
@ -83,7 +85,7 @@ const SupplierSelector: React.FC<{ visible: boolean; onCancel: () => void; onSel
      <Form layout="inline" form={form} onFinish={getTableList} style={{ marginBottom: 16 }}>

       <Form.Item name="name" label="供应商名称">
-         <Input placeholder="请输入供应商名称关键字" style={{ width: 220 }} allowClear maxLength={20} />
+         <Input placeholder="请输入供应商名称关键字" style={{ width: 220 }} allowClear maxLength={100} />
       </Form.Item>
       <Form.Item name="supplierType" label="境内/境外">
         <Select style={{ width: 160 }} placeholder="请选择境内/境外" allowClear>
--- a/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx
+++ b/src/pages/supplier/admission/admissionManagement/components/ViewModal.tsx
@ -35,6 +35,7 @@ interface coscoAccessWorks {
  reviewStatusText: string;
  accessType: string;
  accessDesc: string;
+  approveStatusText: string;
 }

 const ViewModal: React.FC<{
@ -102,7 +103,7 @@ const ViewModal: React.FC<{
                  )
                })}
              </Descriptions.Item>
-              <Descriptions.Item label="审批结果">{data.coscoAccessWork.reviewStatusText}</Descriptions.Item>
+              <Descriptions.Item label="审批结果">{data.coscoAccessWork.approveStatusText}</Descriptions.Item>
            </>
          )}

--- a/src/pages/supplier/admission/admissionManagement/index.tsx
+++ b/src/pages/supplier/admission/admissionManagement/index.tsx
@ -104,12 +104,12 @@ const AccessManagement: React.FC = () => {
      render: (_: any, record: any) => (
        <Space>
          <a onClick={() => openModal('view', record)}>查看</a>
-          {((record.reviewStatus === '3' && record.accessTypeText === 'online') && !record.approveStatusText) && (
+          {((record.reviewStatus === '3' && record.accessType === 'online') && !record.approveStatusText) && (
            <a onClick={() => handleApproval(record.id)}>
              发起审批
            </a>
          )}
-          {(record.reviewStatus === '3' && record.accessTypeText === 'online') && (
+          {(record.reviewStatus === '3' && record.accessType === 'online') && (
            <>
              <a onClick={() => openModal('result', record)}>评审结果</a>
            </>
--- a/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx
+++ b/src/pages/supplier/admission/admissionReviewManagement/components/ViewModal.tsx
@ -35,6 +35,7 @@ interface coscoAccessWorks {
  reviewStatusText: string;
  accessType: string;
  accessDesc: string;
+  approveStatusText: string;
 }

 const ViewModal: React.FC<{
@ -102,7 +103,7 @@ const ViewModal: React.FC<{
                  )
                })}
              </Descriptions.Item>
-              <Descriptions.Item label="审批结果">{data.coscoAccessWork.reviewStatusText}</Descriptions.Item>
+              <Descriptions.Item label="审批结果">{data.coscoAccessWork.approveStatusText}</Descriptions.Item>
            </>
          )}