Merge branch 'dev' of http://git.ycjcjy.com/ubpa/pc-admin into dev

src/app.jsx

@@ -30,7 +30,6 @@ export async function getInitialState() {
   if (history.location.pathname !== loginPath) {
     const res = await fetchUserInfo();
     localStorage.setItem('roleAlias', res.roleAlias);
-    localStorage.setItem('orgId', res.user.orgId);
     return {
       fetchUserInfo,
       currentUser: res.user,

src/components/RightContent/AvatarDropdown.jsx

@@ -13,7 +13,7 @@ import { getLoginPath } from '@/utils';
  */
 const loginOut = async () => {
   const loginPath = getLoginPath()
-  setInitialState((s) => ({ ...s, currentUser: undefined }));
+  
   localStorage.removeItem('token');
   const { query = {}, pathname } = history.location;
   const { redirect } = query;
@@ -28,13 +28,14 @@ const loginOut = async () => {
 };
 const AvatarDropdown = ({ menu }) => {
   const [showPasswordModal, setShowPasswordModal] = useState(false);
-  const { initialState } = useModel('@@initialState');
+  const { initialState,setInitialState } = useModel('@@initialState');
 
   const onMenuClick = useCallback(
     (event) => {
       const { key } = event;
 
       if (key === 'logout') {
+        setInitialState((s) => ({ ...s, currentUser: undefined }));
         loginOut();
         return;
       }

src/pages/deleteLog/index.jsx

@@ -17,7 +17,7 @@ const formatterTime = (val) => {
 
 export default (props) => {
   const { initialState } = useModel('@@initialState');
-  let orgId = localStorage.getItem('orgId');
+  let myOrgId = initialState.currentUser.orgId;
 
   const [orgName,setOrgName]=useState('')
 
@@ -101,7 +101,10 @@ export default (props) => {
         columns={columns}
         request={getDeleteformList}
         options={false}
-        params={{ start, end, deleteStart, deleteEnd,orgId }}        
+        search={{
+          defaultCollapsed:false
+        }}
+        params={{ start, end, deleteStart, deleteEnd,myOrgId }}        
         onReset={handleReset}
         rowKey="formId"
       />

src/pages/org/org/Edit.jsx

@@ -101,7 +101,7 @@ export default (props) => {
                 name="orgName"
                 rules={[{ required: true, message: '请填写企业名称!' }]}
               >
-                <Input />
+                <Input  readOnly={formData?.canEditName}/>
               </Form.Item>
               <Form.Item
                 label="权重"

src/pages/resumework/abnormal/index.jsx

@@ -1,4 +1,5 @@
 import React from 'react'
+import { useModel } from 'umi';
 import moment from 'moment';
 import { Badge, Image } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
@@ -9,7 +10,8 @@ const formatterTime = (val) => {
   return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
 };
 export default (props) => {
-  let orgId = localStorage.getItem('orgId');
+  const { initialState } = useModel('@@initialState');
+  let myOrgId = initialState.currentUser.orgId;
   const columns = [
     {
       title: '企业名称',
@@ -66,7 +68,7 @@ export default (props) => {
       <PageTable
         columns={columns}
         request={getAbnormalList}
-        params={{orgId}}
+        params={{myOrgId}}
         search={false}
         options={false}
         rowKey="formId"

src/pages/resumework/form/index.jsx

@@ -159,6 +159,9 @@ export default (props) => {
         request={getList}
         expfunc={exportList}
         options={false}
+        search={{
+          defaultCollapsed:false
+        }}
         form={{ ignoreRules: false }}
         manualRequest={true}
         revalidateOnFocus={false}

src/pages/user/Login/index.jsx

@@ -19,7 +19,6 @@ const Login = () => {
       // 登录
       const { user, menu, report_url, roleAlias } = await login({ ...values, password: md5(values.password) });
       localStorage.setItem('roleAlias', roleAlias);
-      localStorage.setItem('orgId', user.orgId);
       await setInitialState((s) =>
       ({
         ...s,

src/pages/user/orgLogin/index.jsx

@@ -19,7 +19,6 @@ const Login = () => {
       // 登录
       const { user, menu, report_url, roleAlias } = await orgLogin({ ...values, password: md5(values.password) });
       localStorage.setItem('roleAlias', roleAlias);
-      localStorage.setItem('orgId', user.orgId);
       await setInitialState((s) => ({ ...s, currentUser: user, menuAccess: menu, report_url: report_url, roleAlias: roleAlias }));
       message.success('登录成功！');
       /** 此方法会跳转到 redirect 参数所在的位置 */

src/services/work.js

@@ -1,5 +1,6 @@
 import request from '@/utils/request';
 import moment from 'moment';
+import { getIsAllParams } from '@/utils';
 
 // 获取列表
 export const getList = (params) => request('/resume-work-form', { params });
@@ -9,25 +10,17 @@ export const exportList = (params) => request('/resume-work-form/export', { para
 
 // 获取异常列表
 export const getAbnormalList = (params) =>{
-  if (params.orgId==null||params.orgId=='null') {
-    delete params.orgId
-    params.isAll=true
-  }
   return request(
     `/resume-work-form?start=${moment(Date.now()).format('YYYY-MM-DD')}&end=${moment(
       Date.now(),
     ).format('YYYY-MM-DD')}&isAbnormal=true`,
-    { params },
+    {params:getIsAllParams(params)},
   );
     }
 // 获取删除列表
 export const getDeleteformList = (params) =>{
-  if (params.orgId==null||params.orgId=='null') {
-    delete params.orgId
-    params.isAll=true
-  }
   return request(`/resume-work-form?isDelete=true`, {
-    params,
+    params:getIsAllParams(params),
   });
 }
 

src/utils/index.js

@@ -7,3 +7,12 @@ export function getLoginPath(){
     return '/user/orgLogin'
   }
 }
+
+export const getIsAllParams=(params)=>{
+  if (!params.myOrgId) {
+    params.isAll=true
+  } else {
+    params.orgId=params.myOrgId
+  }
+  return params
+}