优化与集团个人树增加单位搜索字段

src/pages/register/supplier/CommonFormSections.tsx

@@ -750,7 +750,7 @@ export const SurveySection: React.FC<SurveySectionProps> = ({ form, surveyQuesti
                   {
                     title: '问题',
                     dataIndex: 'questionName',
-                    render: (text) => <div style={{ whiteSpace: 'pre-line' }}>{text}</div>,
+                    render: (text) => <div style={{ whiteSpace: 'pre-line' }}><span style={{color: 'red'}}>*</span> {text}</div>,
                   },
                   {
                     title: '回复',
@@ -817,7 +817,14 @@ export const AttachmentSection: React.FC<CommonFormSectionsProps> = ({ form }) =
             下载模版
           </Button>
         </Descriptions.Item>
-        <Descriptions.Item label="请加盖公司公章后上传">
+       <Descriptions.Item
+          label={
+            <span>
+              <span style={{ color: 'red' }}>*</span>
+              请加盖公司公章后上传
+            </span>
+          }
+        >
           <Form.List name="coscoSupplierSurveyAttachments">
             {(fields, { add, remove }) => {
               // 确保至少有一项用于反商业贿赂承诺书

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

@@ -119,7 +119,7 @@ const AccessManagement: React.FC = () => {
       render: (_: any, record: any) => (
         <Space>
           <a onClick={() => openModal('view', record)}>查看</a>
-          {((record.reviewStatus === '3' && record.accessType !== 'scattered') && !record.approveStatusText) && (
+          {((record.reviewStatus === '3' ) && !record.approveStatusText) && (
             <a onClick={() => handleApproval(record.id)}>
               发起审批
             </a>

src/pages/supplier/backend/changeProgressInquiry/index.tsx

@@ -68,13 +68,13 @@ const CooperateEnterprise: React.FC = () => {
       dataIndex: 'createTime',
       key: 'createTime',
     },
-    {
+    // {
-      title: '审批单位',
+    //   title: '审批单位',
-      dataIndex: 'deptNames',
+    //   dataIndex: 'deptNames',
-      key: 'deptNames',
+    //   key: 'deptNames',
-      width: 300,
+    //   width: 300,
-      ellipsis: true
+    //   ellipsis: true
-    },
+    // },
     {
       title: '审批状态',
       dataIndex: 'approveStatusText',
@@ -165,9 +165,9 @@ const CooperateEnterprise: React.FC = () => {
             <Form.Item name="changeDesc" label="变更内容">
               <Input style={{ width: 160 }} placeholder="请输入变更内容" allowClear maxLength={50} />
             </Form.Item>
-            <Form.Item name="deptNames" label="审批单位">
+            {/* <Form.Item name="deptNames" label="审批单位">
               <AccessDepartmentSelect placeholder={'请选择审批单位'} />
-            </Form.Item>
+            </Form.Item> */}
             <Form.Item name="createTime" label="提交时间">
               <DatePicker.RangePicker placeholder={['开始时间', '结束时间']} allowClear />
             </Form.Item>

src/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index.tsx

@@ -99,7 +99,7 @@ const groupQualifiedSupplierQuery: React.FC<Props> = ({ 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<Props> = ({ dispatch }) => {
       }
     })
     setTreeLoading(true);
-    treeData({}).then((res) => {
+    treeData({orgCategory: 'Org'}).then((res) => {
       const { code, data } = res;
       if (code === 200) {
         const tree = formatTreeData(data);

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 });
 

src/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index.tsx

@@ -98,7 +98,7 @@ const PersonQualifiedSupplierQuery: React.FC<Props> = ({ 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<Props> = ({ dispatch }) => {
   // 初始化
   useEffect(() => {
     setTreeLoading(true);
-    treeData({}).then((res) => {
+    treeData({orgCategory: 'Org'}).then((res) => {
       const { code, data } = res;
       if (code === 200) {
         const tree = formatTreeData(data);

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 });