Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 722031cfba2bedbd2582d1c56b93450ab98c31ce
+  newTag: e0e6bbe3566ad76d6afa636e13e35118df96fcd3

src/pages/pilotTraining/ licensureExamination/institutionsList/index.tsx

@@ -13,6 +13,7 @@ import {
   listOrgPageType,
 } from '~/api/interface/pilotTrainType';
 import { filterObjAttr } from '~/utils';
+import { useSelector } from 'react-redux';
 
 //机构列表返回类型
 type institutionListType = InterDataType<listOrgPageType>['list'];
@@ -27,6 +28,7 @@ type listOrgPageParametersType = InterReqType<listOrgPageType>;
 
 const InstitutionsList = () => {
   const navigate = useNavigate();
+  const { userInfo } = useSelector((state: any) => state.UserInfo);
   //机型下拉列表
   const [modelsList, setModelsList] = useState<modelsListType>([]);
   //等级下拉列表
@@ -107,7 +109,12 @@ const InstitutionsList = () => {
           <Button type='link' onClick={() => editInstitutionsClick(record)}>
             编辑
           </Button>
-          <Button type='link' danger onClick={() => deleteInstitutionsClick(record)}>
+          <Button
+            type='link'
+            danger
+            onClick={() => deleteInstitutionsClick(record)}
+            disabled={!userInfo.roleInfo.superAdmin}
+          >
             删除
           </Button>
         </>
@@ -151,7 +158,7 @@ const InstitutionsList = () => {
       onOk: () => {
         PilotTrainAPI.removeOrg({ id: record.id }).then(({ code }) => {
           if (code === '200') {
-            message.success('删除成功');
+            message.success('删除成功').then();
             if (pagination.pageNo !== 1 && tableData.length === 1) {
               pagination.pageNo -= 1;
             }
@@ -207,7 +214,12 @@ const InstitutionsList = () => {
       <SearchBox
         search={search}
         child={
-          <Button icon={<PlusOutlined />} type='primary' onClick={toAddInstitutions}>
+          <Button
+            icon={<PlusOutlined />}
+            type='primary'
+            onClick={toAddInstitutions}
+            disabled={true}
+          >
             新增
           </Button>
         }