李志伟 3 lat temu
rodzic
commit
ed8937cc49

+ 5
- 2
src/pages/deleteLog/index.jsx Wyświetl plik

@@ -17,7 +17,7 @@ const formatterTime = (val) => {
17 17
 
18 18
 export default (props) => {
19 19
   const { initialState } = useModel('@@initialState');
20
-  let orgId = initialState.currentUser.orgId;
20
+  let myOrgId = initialState.currentUser.orgId;
21 21
 
22 22
   const [orgName,setOrgName]=useState('')
23 23
 
@@ -101,7 +101,10 @@ export default (props) => {
101 101
         columns={columns}
102 102
         request={getDeleteformList}
103 103
         options={false}
104
-        params={{ start, end, deleteStart, deleteEnd,orgId }}        
104
+        search={{
105
+          defaultCollapsed:false
106
+        }}
107
+        params={{ start, end, deleteStart, deleteEnd,myOrgId }}        
105 108
         onReset={handleReset}
106 109
         rowKey="formId"
107 110
       />

+ 2
- 2
src/pages/resumework/abnormal/index.jsx Wyświetl plik

@@ -11,7 +11,7 @@ const formatterTime = (val) => {
11 11
 };
12 12
 export default (props) => {
13 13
   const { initialState } = useModel('@@initialState');
14
-  let orgId = initialState.currentUser.orgId;
14
+  let myOrgId = initialState.currentUser.orgId;
15 15
   const columns = [
16 16
     {
17 17
       title: '企业名称',
@@ -68,7 +68,7 @@ export default (props) => {
68 68
       <PageTable
69 69
         columns={columns}
70 70
         request={getAbnormalList}
71
-        params={{orgId}}
71
+        params={{myOrgId}}
72 72
         search={false}
73 73
         options={false}
74 74
         rowKey="formId"

+ 3
- 0
src/pages/resumework/form/index.jsx Wyświetl plik

@@ -159,6 +159,9 @@ export default (props) => {
159 159
         request={getList}
160 160
         expfunc={exportList}
161 161
         options={false}
162
+        search={{
163
+          defaultCollapsed:false
164
+        }}
162 165
         form={{ ignoreRules: false }}
163 166
         manualRequest={true}
164 167
         revalidateOnFocus={false}

+ 3
- 2
src/utils/index.js Wyświetl plik

@@ -9,9 +9,10 @@ export function getLoginPath(){
9 9
 }
10 10
 
11 11
 export const getIsAllParams=(params)=>{
12
-  if (!params.orgId) {
13
-    delete params.orgId
12
+  if (!params.myOrgId) {
14 13
     params.isAll=true
14
+  } else {
15
+    params.orgId=params.myOrgId
15 16
   }
16 17
   return params
17 18
 }