fixbug

src/pages/member/memberMaintain/detailed/index.tsx

@@ -60,10 +60,10 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
   };
 
   useEffect(() => {
-    const { match } = props;
-    const url = match.url === '/' ? '' : match.url;
-    // 手动重定向到基础信息页，防止查询字符串被弄掉
-    history.replace(`${url}/basicInfo?id=${id}&validateId=${validateId}`);
+    // const { match } = props;
+    // const url = match.url === '/' ? '' : match.url;
+    // // 手动重定向到基础信息页，防止查询字符串被弄掉
+    // history.replace(`${url}/basicInfo?id=${id}&validateId=${validateId}`);
     getBasicInfo();
   }, []);
   

src/pages/member/memberMaintain/index.tsx

@@ -87,7 +87,7 @@ const memberMaintain: React.FC<[]> = () => {
       key: 'name',
       render: (text: any, record: any) => (
         <EyePreview
-          url={`/memberAbility/manage/maintainDetail?id=${record.memberId}&validateId=${record.validateId}&preview=1`}
+          url={`/memberAbility/manage/maintainDetail/basicInfo?id=${record.memberId}&validateId=${record.validateId}`}
         >
           {text}
         </EyePreview>

src/pages/member/memberPrConfirm/auditPrComfirm.tsx

@@ -19,8 +19,9 @@ import TabTree, { createTreeActions } from '@/components/TabTree';
 import CheckboxTree from '@/components/CheckBoxTree';
 import MellowCard from '@/components/MellowCard';
 import NiceForm from '@/components/NiceForm';
-import { createFormActions, FormEffectHooks } from '@formily/antd';
+import { createFormActions, FormEffectHooks, FormPath } from '@formily/antd';
 import { useTreeTabs, FormState } from '@/hooks/useTreeTabs';
+import { MEMBER_INNER_STATUS_SUCCESS } from '@/constants';
 import { 
   MEMBER_STATUS_TAG_MAP, 
   MEMBER_INNER_STATUS_BADGE_COLOR, 
@@ -74,6 +75,22 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
         return;
       }
       setBasicInfo(res.data);
+
+      // 内部状态为 审核通过 才能选择 审核通过选项
+      if (res.data.innerStatus !== MEMBER_INNER_STATUS_SUCCESS) {
+        modalFormActions.setFieldState('agree', (state: any) => {
+          const newMenu = 
+            state.props.enum.map(
+              (item: { label: string, value: any }) => ({ 
+                ...item, 
+                disabled: item.value === 1, 
+              })
+            );
+          FormPath.setIn(state, 'props.enum', newMenu);
+          FormPath.setIn(state, 'value', 0);
+        });
+      }
+      
     }).finally(() => {
       setInfoLoading(false);
     });
@@ -293,7 +310,7 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
                   <StatusTag type={MEMBER_OUTER_STATUS_TYPE[basicInfo?.outerStatus]} title={basicInfo?.outerStatusName} />
                 </Descriptions.Item>
                 <Descriptions.Item label="内部状态">
-                  <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[basicInfo?.innerStatus]} text={basicInfo?.innerStatusName} />
+                  <Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[basicInfo?.innerStatus] || '#999999'} text={basicInfo?.innerStatusName} />
                 </Descriptions.Item>
               </Descriptions>
             </PageHeader>

src/pages/member/memberPrConfirm/schema/index.ts

@@ -124,8 +124,15 @@ export const auditModalSchema: ISchema = {
           type: 'string',
           default: 1,
           enum: [
-            { label: '审核通过', value: 1 },
-            { label: '审核不通过', value: 0 },
+            { 
+              label: '审核通过', 
+              value: 1, 
+              disabled: false,  
+            },
+            { 
+              label: '审核不通过', 
+              value: 0, 
+            },
           ],
           'x-component': 'radio',
           'x-component-props': {},