diff --git a/src/pages/register/supplier/CommonFormSections.tsx b/src/pages/register/supplier/CommonFormSections.tsx index 1bb2c75..6ea9752 100644 --- a/src/pages/register/supplier/CommonFormSections.tsx +++ b/src/pages/register/supplier/CommonFormSections.tsx @@ -750,7 +750,7 @@ export const SurveySection: React.FC = ({ form, surveyQuesti { title: '问题', dataIndex: 'questionName', - render: (text) =>
{text}
, + render: (text) =>
* {text}
, }, { title: '回复', @@ -817,7 +817,14 @@ export const AttachmentSection: React.FC = ({ form }) = 下载模版 - + + * + 请加盖公司公章后上传 + + } + > {(fields, { add, remove }) => { // 确保至少有一项用于反商业贿赂承诺书 diff --git a/src/pages/supplier/admission/admissionManagement/index.tsx b/src/pages/supplier/admission/admissionManagement/index.tsx index 6eba86c..c2a6b7a 100644 --- a/src/pages/supplier/admission/admissionManagement/index.tsx +++ b/src/pages/supplier/admission/admissionManagement/index.tsx @@ -119,7 +119,7 @@ const AccessManagement: React.FC = () => { render: (_: any, record: any) => ( openModal('view', record)}>查看 - {((record.reviewStatus === '3' && record.accessType !== 'scattered') && !record.approveStatusText) && ( + {((record.reviewStatus === '3' ) && !record.approveStatusText) && ( handleApproval(record.id)}> 发起审批 diff --git a/src/pages/supplier/backend/changeProgressInquiry/index.tsx b/src/pages/supplier/backend/changeProgressInquiry/index.tsx index 460127e..2c091fd 100644 --- a/src/pages/supplier/backend/changeProgressInquiry/index.tsx +++ b/src/pages/supplier/backend/changeProgressInquiry/index.tsx @@ -68,13 +68,13 @@ const CooperateEnterprise: React.FC = () => { dataIndex: 'createTime', key: 'createTime', }, - { - title: '审批单位', - dataIndex: 'deptNames', - key: 'deptNames', - width: 300, - ellipsis: true - }, + // { + // title: '审批单位', + // dataIndex: 'deptNames', + // key: 'deptNames', + // width: 300, + // ellipsis: true + // }, { title: '审批状态', dataIndex: 'approveStatusText', @@ -165,9 +165,9 @@ const CooperateEnterprise: React.FC = () => { - + {/* - + */} diff --git a/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index.tsx b/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index.tsx index 05237a5..6aea2ad 100644 --- a/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index.tsx +++ b/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index.tsx @@ -99,7 +99,7 @@ const groupQualifiedSupplierQuery: React.FC = ({ dispatch }) => { if (treeNode.children && treeNode.children.length > 0) return; setTreeLoading(true); try { - const { code, data } = await treeData({ upOrgId: treeNode.orgId }); + const { code, data } = await treeData({ upOrgId: treeNode.orgId, orgCategory: 'Org' }); if (code === 200) { // 懒加载也要格式化数据 const children = formatTreeData(data); @@ -141,7 +141,7 @@ const groupQualifiedSupplierQuery: React.FC = ({ dispatch }) => { } }) setTreeLoading(true); - treeData({}).then((res) => { + treeData({orgCategory: 'Org'}).then((res) => { const { code, data } = res; if (code === 200) { const tree = formatTreeData(data); diff --git a/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/services.ts b/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/services.ts index 2f740d9..631d511 100644 --- a/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/services.ts +++ b/src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/services.ts @@ -21,6 +21,8 @@ export const getCategoryPage = (data: getCategoryPage) => request.post('/coscoSu interface treeInterface { upOrgId?: string + orgId?: string; + orgCategory?: string; //Org } export const treeData = (params:treeInterface) => request.get('/org/list', { params }); diff --git a/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx b/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx index ce92a4c..f75ac2e 100644 --- a/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx +++ b/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx @@ -98,7 +98,7 @@ const PersonQualifiedSupplierQuery: React.FC = ({ dispatch }) => { if (treeNode.children && treeNode.children.length > 0) return; setTreeLoading(true); try { - const res = await treeData({ upOrgId: treeNode.orgId }); + const res = await treeData({ upOrgId: treeNode.orgId, orgCategory: 'Org' }); const { code, data } = res; if (code === 200) { const children = formatTreeData(data); @@ -129,7 +129,7 @@ const PersonQualifiedSupplierQuery: React.FC = ({ dispatch }) => { // 初始化 useEffect(() => { setTreeLoading(true); - treeData({}).then((res) => { + treeData({orgCategory: 'Org'}).then((res) => { const { code, data } = res; if (code === 200) { const tree = formatTreeData(data); diff --git a/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/services.ts b/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/services.ts index b70a583..6f54e89 100644 --- a/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/services.ts +++ b/src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/services.ts @@ -23,6 +23,7 @@ export const getCategoryPage = (data: getCategoryPage) => request.post('/coscoSu interface treeInterface { upOrgId?: string + orgCategory?: string } export const treeData = (params:treeInterface) => request.get('/org/list', { params });