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

config/router.config.ts

@@ -45,6 +45,96 @@ export default [
         icon: 'icon-shouye',
         component: '@/pages/PersonalInfo',
       },
+      {
+        path: '/informationManagement',
+        name: 'informationManagement',
+        icon: 'icon-gongyingshangxinxiguanli',
+        component: '@/layouts/MainLayout',
+        routes: [
+          {
+            path: '/informationManagement/SupplierRegisterAgent',
+            name: 'SupplierRegisterAgent',
+            icon: 'icon-yuntijiantubiao_huiyuanguanli',
+            component: '@/pages/supplier/informationManagement/SupplierRegisterAgent/index',
+          },
+          {
+            path: '/informationManagement/SupplierChangeReviewManage',
+            name: 'SupplierChangeReviewManage',
+            icon: 'icon-biangengshenheguanli',
+            component: '@/pages/supplier/informationManagement/SupplierChangeReviewManage/index',
+          },
+        ]
+      },
+      {
+        path: '/admission',
+        name: 'admission',
+        icon: 'icon-gongyingshangzhunru',
+        component: '@/layouts/MainLayout',
+        routes: [
+          {
+            path: '/admission/admissionManagement',
+            name: 'admissionManagement',
+            icon: 'icon-gongyingshang-zhunruguanli',
+            component: '@/pages/supplier/admission/admissionManagement/index',
+          },
+          {
+            path: '/admission/admissionReviewManagement',
+            name: 'admissionReviewManagement',
+            icon: 'icon-icon-FollowerManagement',
+            component: '@/pages/supplier/admission/admissionReviewManagement/index',
+          },
+          {
+            path: '/admission/SupplierEntryReview',
+            name: 'SupplierEntryReview',
+            icon: 'icon-hetong',
+            component: '@/pages/supplier/admission/SupplierEntryReview/index',
+          },
+          {
+            path: '/admission/SupplierCategoryEntry',
+            name: 'SupplierCategoryEntry',
+            icon: 'icon-ico3',
+            component: '@/pages/supplier/admission/SupplierCategoryEntry/index',
+          },
+          {
+            path: '/admission/SupplierCategoryEntryReview',
+            name: 'SupplierCategoryEntryReview',
+            icon: 'icon-wodeyiban',
+            component: '@/pages/supplier/admission/SupplierCategoryEntryReview/index',
+          },
+        ]
+      },
+      {
+        path: '/informationRetrieval',
+        name: 'informationRetrieval',
+        icon: 'icon-xinxijiansuobeifen',
+        component: '@/layouts/MainLayout',
+        routes: [
+          {
+            path: '/informationRetrieval/registrationQuery',
+            name: 'registrationQuery',
+            icon: 'icon-zhucechaxun',
+            component: '@/pages/supplier/informationRetrieval/registrationQuery/index',
+          },
+          {
+            path: '/informationRetrieval/groupQualifiedSupplierQuery',
+            name: 'groupQualifiedSupplierQuery',
+            icon: 'icon-hezha',
+            component: '@/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index',
+          },
+          {
+            path: '/informationRetrieval/personQualifiedSupplierQuery',
+            name: 'personQualifiedSupplierQuery',
+            icon: 'icon-xinxijiansuobeifen',
+            component: '@/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index',
+          },
+          {
+            path: '/informationRetrieval/mySupplierInquiry',
+            name: 'mySupplierInquiry',
+            icon: 'icon-wodechaxun',
+            component: '@/pages/supplier/informationRetrieval/mySupplierInquiry/index',
+          },
+        ]
+      },
       // 供应商评价分组
       {
         name: '供应商评价',
@@ -155,40 +245,6 @@ export default [
           },
         ]
       },
-      //数据统计
-      {
-        name: '数据统计',
-        path: '/dataStatistics',
-        icon: 'icon-shujutongji',
-        routes: [
-          {
-            name: '供应商准入情况统计',
-            path: '/dataStatistics/supplierAdmissionStatistics',
-            icon: 'icon-pingjia',
-            component: '@/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics',
-          },{
-            name: '供应商评价情况统计',
-            path: '/dataStatistics/supplierEvaluateStatistics',
-            icon: 'icon-pingjia',
-            component: '@/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics',
-          }, {
-            name: '供应商年审情况统计',
-            path: '/dataStatistics/supplierAnnualStatistics',
-            icon: 'icon-Gc_46_public-SurveyingOutlined',
-            component: '@/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics',
-          }, {
-            name: '供应商资质预警统计',
-            path: '/dataStatistics/supplierQualificationWarningStatistics',
-            icon: 'icon-warning',
-            component: '@/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics',
-          }, {
-            name: '供应商清退情况统计',
-            path: '/dataStatistics/supplierExitStatistics',
-            icon: 'icon-qingtui',
-            component: '@/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics',
-          }
-        ]
-      },
       // 供应商年审分组
       {
         name: '供应商年审',
@@ -298,6 +354,7 @@ export default [
       {
         path: '/backend',
         name: 'backend',
+        flatMenu: true,
         icon: 'icon-gongyingshanghoutai',
         component: '@/layouts/MainLayout',
         routes: [
@@ -327,96 +384,6 @@ export default [
           },
         ],
       },
-      {
-        path: '/informationRetrieval',
-        name: 'informationRetrieval',
-        icon: 'icon-xinxijiansuobeifen',
-        component: '@/layouts/MainLayout',
-        routes: [
-          {
-            path: '/informationRetrieval/registrationQuery',
-            name: 'registrationQuery',
-            icon: 'icon-zhucechaxun',
-            component: '@/pages/supplier/informationRetrieval/registrationQuery/index',
-          },
-          {
-            path: '/informationRetrieval/groupQualifiedSupplierQuery',
-            name: 'groupQualifiedSupplierQuery',
-            icon: 'icon-hezha',
-            component: '@/pages/supplier/informationRetrieval/groupQualifiedSupplierQuery/index',
-          },
-          {
-            path: '/informationRetrieval/personQualifiedSupplierQuery',
-            name: 'personQualifiedSupplierQuery',
-            icon: 'icon-xinxijiansuobeifen',
-            component: '@/pages/supplier/informationRetrieval/personQualifiedSupplierQuery/index',
-          },
-          {
-            path: '/informationRetrieval/mySupplierInquiry',
-            name: 'mySupplierInquiry',
-            icon: 'icon-wodechaxun',
-            component: '@/pages/supplier/informationRetrieval/mySupplierInquiry/index',
-          },
-        ]
-      },
-      {
-        path: '/informationManagement',
-        name: 'informationManagement',
-        icon: 'icon-gongyingshangxinxiguanli',
-        component: '@/layouts/MainLayout',
-        routes: [
-          {
-            path: '/informationManagement/SupplierRegisterAgent',
-            name: 'SupplierRegisterAgent',
-            icon: 'icon-yuntijiantubiao_huiyuanguanli',
-            component: '@/pages/supplier/informationManagement/SupplierRegisterAgent/index',
-          },
-          {
-            path: '/informationManagement/SupplierChangeReviewManage',
-            name: 'SupplierChangeReviewManage',
-            icon: 'icon-biangengshenheguanli',
-            component: '@/pages/supplier/informationManagement/SupplierChangeReviewManage/index',
-          },
-        ]
-      },
-      {
-        path: '/admission',
-        name: 'admission',
-        icon: 'icon-gongyingshangzhunru',
-        component: '@/layouts/MainLayout',
-        routes: [
-          {
-            path: '/admission/admissionManagement',
-            name: 'admissionManagement',
-            icon: 'icon-gongyingshang-zhunruguanli',
-            component: '@/pages/supplier/admission/admissionManagement/index',
-          },
-          {
-            path: '/admission/admissionReviewManagement',
-            name: 'admissionReviewManagement',
-            icon: 'icon-icon-FollowerManagement',
-            component: '@/pages/supplier/admission/admissionReviewManagement/index',
-          },
-          {
-            path: '/admission/SupplierEntryReview',
-            name: 'SupplierEntryReview',
-            icon: 'icon-hetong',
-            component: '@/pages/supplier/admission/SupplierEntryReview/index',
-          },
-          {
-            path: '/admission/SupplierCategoryEntry',
-            name: 'SupplierCategoryEntry',
-            icon: 'icon-ico3',
-            component: '@/pages/supplier/admission/SupplierCategoryEntry/index',
-          },
-          {
-            path: '/admission/SupplierCategoryEntryReview',
-            name: 'SupplierCategoryEntryReview',
-            icon: 'icon-wodeyiban',
-            component: '@/pages/supplier/admission/SupplierCategoryEntryReview/index',
-          },
-        ]
-      },
       {
         path: '/category',
         name: 'category',
@@ -494,6 +461,40 @@ export default [
           },
         ],
       },
+      //数据统计
+      {
+        name: '数据统计',
+        path: '/dataStatistics',
+        icon: 'icon-shujutongji',
+        routes: [
+          {
+            name: '供应商准入情况统计',
+            path: '/dataStatistics/supplierAdmissionStatistics',
+            icon: 'icon-pingjia',
+            component: '@/pages/dataStatistics/supplierAdmissionStatistics/supplierAdmissionStatistics',
+          },{
+            name: '供应商评价情况统计',
+            path: '/dataStatistics/supplierEvaluateStatistics',
+            icon: 'icon-pingjia',
+            component: '@/pages/dataStatistics/supplierEvaluateStatistics/supplierEvaluateStatistics',
+          }, {
+            name: '供应商年审情况统计',
+            path: '/dataStatistics/supplierAnnualStatistics',
+            icon: 'icon-Gc_46_public-SurveyingOutlined',
+            component: '@/pages/dataStatistics/supplierAnnualStatistics/supplierAnnualStatistics',
+          }, {
+            name: '供应商资质预警统计',
+            path: '/dataStatistics/supplierQualificationWarningStatistics',
+            icon: 'icon-warning',
+            component: '@/pages/dataStatistics/supplierQualificationWarningStatistics/supplierQualificationWarningStatistics',
+          }, {
+            name: '供应商清退情况统计',
+            path: '/dataStatistics/supplierExitStatistics',
+            icon: 'icon-qingtui',
+            component: '@/pages/dataStatistics/supplierExitStatistics/supplierExitStatistics',
+          }
+        ]
+      },
       {
         path: '/supplierMessage',
         icon: 'icon-xiaoxitongzhi',

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]);
@@ -57,25 +57,25 @@ const LoginPage: React.FC = () => {
     // }
   }, [form]);
 
-    // 修改密码确认回调
+  // 修改密码确认回调
-    const handleChangePwd = async (values: { userId: string; newPassword: string; confirmPassword: string; }) => {
+  const handleChangePwd = async (values: { userId: string; newPassword: string; confirmPassword: string; }) => {
-      try {
+    try {
-        await changePasswordOnFirstLogin({ 
+      await changePasswordOnFirstLogin({
-          userId: userId,
+        userId: userId,
-          newPassword: encryptWithRsa(values.newPassword, false),
+        newPassword: encryptWithRsa(values.newPassword, false),
-          confirmPassword: encryptWithRsa(values.confirmPassword, false)
+        confirmPassword: encryptWithRsa(values.confirmPassword, false)
-         }).then((res) => {
+      }).then((res) => {
-          if(res.data) {
+        if (res.data) {
-            setShowChangePwd(false);
+          setShowChangePwd(false);
-            message.success('修改成功，请重新登录');
+          message.success('修改成功，请重新登录');
-          } else {
+        } else {
-            message.success('修改密码失败');
+          message.success('修改密码失败');
-          }
+        }
-         })
+      })
-      } catch (e: any) {
+    } catch (e: any) {
-        message.error(e?.message || '修改密码失败');
+      message.error(e?.message || '修改密码失败');
-      }
+    }
-    };
+  };
   const onFinish = async (values: any) => {
     setLoading(true);
     try {
@@ -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));
-           //新用户需要修改一次密码
+          message.success('登录成功');
-          if (loginRes.data?.supplierUser?.firstLogin === 1) {
+          if (activeKey === 'supplierLogin') {
-            setShowChangePwd(true);
+            history.push('/backend/workbenches');
           } else {
-            message.success('登录成功');
             history.push('/index');
           }
         });
@@ -191,99 +186,99 @@ const LoginPage: React.FC = () => {
 
   return (
     <>
-       <ChangePasswordModal
+      <ChangePasswordModal
         visible={showChangePwd}
         onOk={handleChangePwd}
       />
 
-    <div className='login-page'>
+      <div className='login-page'>
-      <div className='login-container'>
+        <div className='login-container'>
-        {/* <div className='back-home'>
+          {/* <div className='back-home'>
           <a onClick={() => history.push('/index')}>
             <HomeOutlined /> {intl.formatMessage({ id: 'login.back.home' })}
           </a>
         </div> */}
 
-        <div className='login-title'>{intl.formatMessage({ id: 'login.title' })}</div>
+          <div className='login-title'>{intl.formatMessage({ id: 'login.title' })}</div>
 
-        <div className="login-tab-container">
+          <div className="login-tab-container">
-          <Tabs activeKey={activeKey} onChange={handleTabChange} className='login-tabs'>
+            <Tabs activeKey={activeKey} onChange={handleTabChange} className='login-tabs'>
-            <TabPane tab={intl.formatMessage({ id: 'login.tab.supplier' })} key="supplierLogin" />
+              <TabPane tab={intl.formatMessage({ id: 'login.tab.supplier' })} key="supplierLogin" />
-            {/* <TabPane tab={intl.formatMessage({ id: 'login.tab.expert' })} key="expertLogin" /> */}
+              {/* <TabPane tab={intl.formatMessage({ id: 'login.tab.expert' })} key="expertLogin" /> */}
-            <TabPane tab={intl.formatMessage({ id: 'login.tab.agent' })} key="accountLogin" />
+              <TabPane tab={intl.formatMessage({ id: 'login.tab.agent' })} key="accountLogin" />
-          </Tabs>
+            </Tabs>
-        </div>
+          </div>
 
-        <Form
+          <Form
-          form={form}
+            form={form}
-          name="login"
+            name="login"
-          className='login-form'
+            className='login-form'
-          initialValues={{ remember: false }}
+            initialValues={{ remember: false }}
-          onFinish={onFinish}
+            onFinish={onFinish}
-        >
-          <Form.Item
-            name="account"
-            rules={[{ required: true, message: intl.formatMessage({ id: 'login.username.placeholder' }) + '!' }]}
           >
-            <Input
+            <Form.Item
-              prefix={<UserOutlined className="site-form-item-icon" />}
+              name="account"
-              placeholder={intl.formatMessage({ id: 'login.username.placeholder' })}
+              rules={[{ required: true, message: intl.formatMessage({ id: 'login.username.placeholder' }) + '!' }]}
-              size="large"
+            >
-            />
+              <Input
-          </Form.Item>
+                prefix={<UserOutlined className="site-form-item-icon" />}
+                placeholder={intl.formatMessage({ id: 'login.username.placeholder' })}
+                size="large"
+              />
+            </Form.Item>
 
-          <Form.Item
+            <Form.Item
-            name="password"
+              name="password"
-            rules={[{ required: true, message: intl.formatMessage({ id: 'login.password.placeholder' }) + '!' }]}
+              rules={[{ required: true, message: intl.formatMessage({ id: 'login.password.placeholder' }) + '!' }]}
-          >
+            >
-            <Input.Password
+              <Input.Password
-              prefix={<LockOutlined className="site-form-item-icon" />}
+                prefix={<LockOutlined className="site-form-item-icon" />}
-              placeholder={intl.formatMessage({ id: 'login.password.placeholder' })}
+                placeholder={intl.formatMessage({ id: 'login.password.placeholder' })}
-              iconRender={visible => (visible ? <EyeTwoTone /> : <EyeInvisibleOutlined />)}
+                iconRender={visible => (visible ? <EyeTwoTone /> : <EyeInvisibleOutlined />)}
-              size="large"
+                size="large"
-            />
+              />
-          </Form.Item>
+            </Form.Item>
-          <Form.Item
+            <Form.Item
-            name="identifying"
+              name="identifying"
-            rules={[{ required: true, message: intl.formatMessage({ id: 'login.captcha.placeholder' }) + '!' }]}
+              rules={[{ required: true, message: intl.formatMessage({ id: 'login.captcha.placeholder' }) + '!' }]}
-          >
+            >
-            <Input
+              <Input
-              placeholder={intl.formatMessage({ id: 'login.captcha.placeholder' })}
+                placeholder={intl.formatMessage({ id: 'login.captcha.placeholder' })}
-              size="large"
+                size="large"
-              maxLength={6}
+                maxLength={6}
-              autoComplete="off"
+                autoComplete="off"
-              prefix={null}
+                prefix={null}
-              suffix={
+                suffix={
-                <img
+                  <img
-                  src={`data:image/png;base64,${captchaImg}`}
+                    src={`data:image/png;base64,${captchaImg}`}
-                  alt="验证码"
+                    alt="验证码"
-                  style={{ cursor: 'pointer', height: 32, verticalAlign: 'middle' }}
+                    style={{ cursor: 'pointer', height: 32, verticalAlign: 'middle' }}
-                  onClick={fetchCaptcha}
+                    onClick={fetchCaptcha}
-                />
+                  />
-              }
+                }
-            />
+              />
-          </Form.Item>
+            </Form.Item>
 
-          <Form.Item>
+            <Form.Item>
-            <div className='login-options'>
+              <div className='login-options'>
-              <Form.Item name="remember" valuePropName="checked" noStyle>
+                <Form.Item name="remember" valuePropName="checked" noStyle>
-                <Checkbox>{intl.formatMessage({ id: 'login.remember' })}</Checkbox>
+                  <Checkbox>{intl.formatMessage({ id: 'login.remember' })}</Checkbox>
-              </Form.Item>
+                </Form.Item>
-              <Button type="link" onClick={() => onForgot()} className="login-form-forgot" href="">
+                <Button type="link" onClick={() => onForgot()} className="login-form-forgot" href="">
-                {intl.formatMessage({ id: 'login.forgot' })}
+                  {intl.formatMessage({ id: 'login.forgot' })}
+                </Button>
+              </div>
+            </Form.Item>
+
+            <Form.Item>
+              <Button type="primary" htmlType="submit" className="login-form-button" loading={loading} size="large">
+                {intl.formatMessage({ id: 'login.button' })}
               </Button>
-            </div>
+              {activeKey !== 'accountLogin' && renderRegisterLink()}
-          </Form.Item>
+            </Form.Item>
-
+          </Form>
-          <Form.Item>
+        </div>
-            <Button type="primary" htmlType="submit" className="login-form-button" loading={loading} size="large">
-              {intl.formatMessage({ id: 'login.button' })}
-            </Button>
-            {activeKey !== 'accountLogin' && renderRegisterLink()}
-          </Form.Item>
-        </Form>
       </div>
-    </div>
     </>
   );
 };