Commit a0d76721631f4f8849888398c45e8f86a68e2f16
Merge branch 'bugfix-0610' into 'master'
Bugfix 0610 See merge request !55
Showing
2 changed files
with
0 additions
and
2 deletions
src/pages/OrderReport/index.tsx
| @@ -181,7 +181,6 @@ const OrderReportPage = () => { | @@ -181,7 +181,6 @@ const OrderReportPage = () => { | ||
| 181 | }, [selectedMonth, selectedYear]); | 181 | }, [selectedMonth, selectedYear]); |
| 182 | 182 | ||
| 183 | useEffect(() => { | 183 | useEffect(() => { |
| 184 | - loadData(); | ||
| 185 | getSalesCodeOptions(); | 184 | getSalesCodeOptions(); |
| 186 | }, []); | 185 | }, []); |
| 187 | 186 |
src/pages/ResearchGroup/ResearchGroup/constant.tsx
| @@ -20,7 +20,6 @@ export const RESEARCH_GROUP_COLUMNS = [ | @@ -20,7 +20,6 @@ export const RESEARCH_GROUP_COLUMNS = [ | ||
| 20 | key: 'id', | 20 | key: 'id', |
| 21 | valueType: 'index', | 21 | valueType: 'index', |
| 22 | hideInSearch: true, | 22 | hideInSearch: true, |
| 23 | - hideInTable: true, | ||
| 24 | }, | 23 | }, |
| 25 | { | 24 | { |
| 26 | title: '课题组名称', | 25 | title: '课题组名称', |