Commit 0c4388301d9259669d056349a606db562faf9d8d
Merge branch 'bugfix-0516client' into 'dev'
Bugfix 0516client See merge request !35
Showing
1 changed file
with
10 additions
and
36 deletions
src/pages/Client/Client/index.tsx
| @@ -9,7 +9,6 @@ import { | @@ -9,7 +9,6 @@ import { | ||
| 9 | postAdminClientQueryClientPage, | 9 | postAdminClientQueryClientPage, |
| 10 | postServiceConstClientLevels, | 10 | postServiceConstClientLevels, |
| 11 | postServiceConstClientSource, | 11 | postServiceConstClientSource, |
| 12 | - postServiceOrderQueryCustomerInformation, | ||
| 13 | } from '@/services'; | 12 | } from '@/services'; |
| 14 | import { downloadFile } from '@/services/order'; | 13 | import { downloadFile } from '@/services/order'; |
| 15 | import { enumToSelect } from '@/utils'; | 14 | import { enumToSelect } from '@/utils'; |
| @@ -76,33 +75,8 @@ const columns = [ | @@ -76,33 +75,8 @@ const columns = [ | ||
| 76 | { | 75 | { |
| 77 | title: '课题组', | 76 | title: '课题组', |
| 78 | dataIndex: 'institutionContactName', | 77 | dataIndex: 'institutionContactName', |
| 79 | - valueType: 'select', | 78 | + valueType: 'text', |
| 80 | hideInTable: true, | 79 | hideInTable: true, |
| 81 | - fieldProps: { | ||
| 82 | - showSearch: true, | ||
| 83 | - // mode: 'tags', // 允许自定义输入 | ||
| 84 | - }, | ||
| 85 | - request: async (value, { params }) => { | ||
| 86 | - const keywords = value.keyWords; | ||
| 87 | - const { data } = await postServiceOrderQueryCustomerInformation({ | ||
| 88 | - data: { | ||
| 89 | - name: 'institutionContactName', | ||
| 90 | - institutionContactName: keywords, | ||
| 91 | - }, | ||
| 92 | - params: params, | ||
| 93 | - }); | ||
| 94 | - let options = data | ||
| 95 | - .filter((c: any) => { | ||
| 96 | - return c.orderName === 'institutionCustomerUser'; | ||
| 97 | - }) | ||
| 98 | - .map((item: any) => { | ||
| 99 | - return { | ||
| 100 | - label: item.orderValue, | ||
| 101 | - value: item.orderValue, | ||
| 102 | - }; | ||
| 103 | - }); | ||
| 104 | - return options; | ||
| 105 | - }, | ||
| 106 | }, | 80 | }, |
| 107 | { | 81 | { |
| 108 | title: '关联销售', | 82 | title: '关联销售', |
| @@ -195,15 +169,15 @@ const columns = [ | @@ -195,15 +169,15 @@ const columns = [ | ||
| 195 | valueType: 'dateTime', | 169 | valueType: 'dateTime', |
| 196 | hideInSearch: true, | 170 | hideInSearch: true, |
| 197 | }, | 171 | }, |
| 198 | - { | ||
| 199 | - title: '最新更进时间', | ||
| 200 | - key: 'since', | ||
| 201 | - width: 150, | ||
| 202 | - ellipsis: true, | ||
| 203 | - dataIndex: 'updateTime', | ||
| 204 | - valueType: 'dateTime', | ||
| 205 | - hideInSearch: true, | ||
| 206 | - }, | 172 | + // { |
| 173 | + // title: '最新更进时间', | ||
| 174 | + // key: 'since', | ||
| 175 | + // width: 150, | ||
| 176 | + // ellipsis: true, | ||
| 177 | + // dataIndex: 'updateTime', | ||
| 178 | + // valueType: 'dateTime', | ||
| 179 | + // hideInSearch: true, | ||
| 180 | + // }, | ||
| 207 | // { | 181 | // { |
| 208 | // title: '最新跟进时间', | 182 | // title: '最新跟进时间', |
| 209 | // key: 'since', | 183 | // key: 'since', |