Merge branch 'dev' of http://59.110.10.99:53000/liuc/fe_supplier_frontend into dev

config/router.config.ts

@@ -298,6 +298,7 @@ export default [
       {
         path: '/backend',
         name: 'backend',
+        flatMenu: true,
         icon: 'icon-gongyingshanghoutai',
         component: '@/layouts/MainLayout',
         routes: [

src/components/CompanyInfo/component/InvoiceFormModal.tsx

@@ -60,7 +60,7 @@ const InvoiceFormModal: React.FC<props> = ({
                             ...data,
                             id: data.id ? data.id : null,
                             attachment: data.qualificationCertificate
-                                ? [{ uid: '-1', name: data.qualificationCertificate, url: data.qualificationCertificate, status: 'done', response: { url: data.qualificationCertificate } }]
+                                ? [{ uid: '-1', name: '附件', url: data.qualificationCertificate, status: 'done', response: { url: data.qualificationCertificate } }]
                                 : [],
                         };
                         console.log(fields, 'fields');

src/components/CompanyInfo/component/QualificationFormModal.tsx

@@ -54,7 +54,7 @@ const QualificationFormModal: React.FC<QualificationFormModalProps> = ({
                             termOfValidity: data.termOfValidity ? moment(data.termOfValidity) : undefined,
 
                             attachment: data.accessory
-                                ? [{ uid: '-1', name: data.accessory, url: data.accessory, status: 'done', response: { url: data.accessory } }]
+                                ? [{ uid: '-1', name: '附件', url: data.accessory, status: 'done', response: { url: data.accessory } }]
                                 : [],
                         };
                         console.log(fields, 'fields');
@@ -166,7 +166,7 @@ const QualificationFormModal: React.FC<QualificationFormModalProps> = ({
                     <Descriptions.Item label="附件">
                         {viewData.attachment?.[0]?.url ? (
                             <a href={viewData.attachment[0].url} target="_blank" rel="noopener noreferrer">
-                                {viewData.attachment[0].name || '查看附件'}
+                               查看附件
                             </a>
                         ) : '无'}
                     </Descriptions.Item>

src/layouts/BasicLayout.tsx

@@ -167,7 +167,6 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
     if (menuStr) {
       const menus = JSON.parse(menuStr);
       const filteredMenus = filterMenusByLocalConfig(routes, menus);
-      console.log(filteredMenus,'filteredMenus');
       const hasPersonalInfo = filteredMenus.some(item => item.path === '/PersonalInfo');
       if (!hasPersonalInfo) {
         filteredMenus.push({
@@ -178,6 +177,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
           hideInMenu: true
         });
       }
+      console.log(convertMenuData(filteredMenus),'convertMenuData(filteredMenus)')
       setMenuRoutes(convertMenuData(filteredMenus));
     }
   }, []);

src/pages/login/login.tsx

@@ -39,7 +39,7 @@ const LoginPage: React.FC = () => {
       })
     }
 
-    form.setFieldsValue( { password: 'cosco2025', identifying: '1' } )
+    form.setFieldsValue({ password: 'cosco2025', identifying: '1' })
 
 
   }, [activeKey]);
@@ -65,7 +65,7 @@ const LoginPage: React.FC = () => {
         newPassword: encryptWithRsa(values.newPassword, false),
         confirmPassword: encryptWithRsa(values.confirmPassword, false)
       }).then((res) => {
-          if(res.data) {
+        if (res.data) {
           setShowChangePwd(false);
           message.success('修改成功，请重新登录');
         } else {
@@ -100,34 +100,29 @@ const LoginPage: React.FC = () => {
         //存入供应商用户id
         if (activeKey === 'supplierLogin') {
           sessionStorage.setItem('userId', loginRes.data.supplierUser.userId);
+          if (loginRes.data?.supplierUser?.firstLogin === 1) {
+            setUserId(loginRes.data.supplierUser.userId)
+            setShowChangePwd(true);
+            return
+          }
         } else if (activeKey === 'expertLogin') {
           //存入专家用户id
           // sessionStorage.setItem('userId', loginRes.data.expertUser.userId);
         } else if (activeKey === 'accountLogin') {
           //存入招标代理用户id
           sessionStorage.setItem('userId', loginRes.data.user.userId);
-          //部门
-          // queryUserOrgAll().then((res) => {
-          //   const { code, data } = res;
-          //   if (code == 200) {
-          //     sessionStorage.setItem('userOrgAll', JSON.stringify(data) );
-          //   }
-          // })
         }
         sessionStorage.setItem('currentUser', JSON.stringify(loginRes.data));
+
         await getUserinfo().then(async (res) => {
           const roleIdList = res.authorityList.map((item: any) => item.roleId);
-          console.log(res);
-          
-          setUserId(res.userId)
           sessionStorage.setItem('Userinfo', JSON.stringify(res));
           const menuList: any = await findMenuList({ roleIdList });
           sessionStorage.setItem('menuList', JSON.stringify(menuList.data));
-           //新用户需要修改一次密码
-          if (loginRes.data?.supplierUser?.firstLogin === 1) {
-            setShowChangePwd(true);
-          } else {
           message.success('登录成功');
+          if (activeKey === 'supplierLogin') {
+            history.push('/backend/workbenches');
+          } else {
             history.push('/index');
           }
         });