Commit bf221616a4dc97a7abef8ae55d092f2e2d970203
1 parent
a065692b
fix: 修改客户管理/跟进记录
Showing
4 changed files
with
56 additions
and
33 deletions
src/pages/Client/Client/Components/ClientDrawer.tsx
@@ -22,12 +22,6 @@ import { useState } from 'react'; | @@ -22,12 +22,6 @@ import { useState } from 'react'; | ||
22 | 22 | ||
23 | export default ({ optType, record, onFinish }) => { | 23 | export default ({ optType, record, onFinish }) => { |
24 | const [form] = Form.useForm(); | 24 | const [form] = Form.useForm(); |
25 | - const requirementsEnum = { | ||
26 | - EXPERIMENTAL_EQUIPMENT: '实验设备', | ||
27 | - EXPERIMENTAL_MATERIALS: '实验材料', | ||
28 | - OTHER: '其他', | ||
29 | - PILOT_TEST_VALIDATION_SERVICES: '中式验证服务', | ||
30 | - }; | ||
31 | //省市区 | 25 | //省市区 |
32 | const [province, setProvince] = useState(''); | 26 | const [province, setProvince] = useState(''); |
33 | const [city, setCity] = useState(''); | 27 | const [city, setCity] = useState(''); |
@@ -403,7 +397,7 @@ export default ({ optType, record, onFinish }) => { | @@ -403,7 +397,7 @@ export default ({ optType, record, onFinish }) => { | ||
403 | placeholder="请输入推荐人" | 397 | placeholder="请输入推荐人" |
404 | /> | 398 | /> |
405 | )} | 399 | )} |
406 | - <ProFormSelect | 400 | + {/* <ProFormSelect |
407 | name="requirements" | 401 | name="requirements" |
408 | label="客户需求" | 402 | label="客户需求" |
409 | placeholder="请输入客户需求" | 403 | placeholder="请输入客户需求" |
@@ -423,7 +417,7 @@ export default ({ optType, record, onFinish }) => { | @@ -423,7 +417,7 @@ export default ({ optType, record, onFinish }) => { | ||
423 | // console.log(res.data, '5656require'); | 417 | // console.log(res.data, '5656require'); |
424 | // return enumToSelect(res.data); | 418 | // return enumToSelect(res.data); |
425 | // }} | 419 | // }} |
426 | - /> | 420 | + /> */} |
427 | <ProFormSelect | 421 | <ProFormSelect |
428 | name="level" | 422 | name="level" |
429 | label="客户等级" | 423 | label="客户等级" |
src/pages/Client/Client/Components/CommunicationHistoryModal.tsx
@@ -130,8 +130,6 @@ export default ({ record }) => { | @@ -130,8 +130,6 @@ export default ({ record }) => { | ||
130 | const [department, setDepartment] = useState(''); // 联系电话 | 130 | const [department, setDepartment] = useState(''); // 联系电话 |
131 | const [gradePosition, setGradePosition] = useState(''); // 联系电话 | 131 | const [gradePosition, setGradePosition] = useState(''); // 联系电话 |
132 | const [referrers, setReferrers] = useState(''); // 推荐人 | 132 | const [referrers, setReferrers] = useState(''); // 推荐人 |
133 | - const [requirementsText, setRequirementsText] = useState(''); // 需求文本 | ||
134 | - const [setTradeStatusText] = useState(''); // 跟进状态文本 | ||
135 | const [levelText, setLevelText] = useState(''); // 客户等级文本 | 133 | const [levelText, setLevelText] = useState(''); // 客户等级文本 |
136 | const [createTime, setCreateTime] = useState(null); // 最新沟通时间 | 134 | const [createTime, setCreateTime] = useState(null); // 最新沟通时间 |
137 | const [address, setAddress] = useState(''); // 客户地址 | 135 | const [address, setAddress] = useState(''); // 客户地址 |
@@ -171,8 +169,6 @@ export default ({ record }) => { | @@ -171,8 +169,6 @@ export default ({ record }) => { | ||
171 | setDepartment(record.department); | 169 | setDepartment(record.department); |
172 | setGradePosition(record.gradePosition); | 170 | setGradePosition(record.gradePosition); |
173 | setReferrers(record.referrers); | 171 | setReferrers(record.referrers); |
174 | - setRequirementsText(record.requirementsText); | ||
175 | - setTradeStatusText(record.tradeStatusText); | ||
176 | setLevelText(record.levelText); | 172 | setLevelText(record.levelText); |
177 | setCreateTime(record.createTime); | 173 | setCreateTime(record.createTime); |
178 | setAddress(record.address); | 174 | setAddress(record.address); |
@@ -223,11 +219,6 @@ export default ({ record }) => { | @@ -223,11 +219,6 @@ export default ({ record }) => { | ||
223 | children: referrers, // 推荐人 | 219 | children: referrers, // 推荐人 |
224 | }, | 220 | }, |
225 | { | 221 | { |
226 | - key: '9', | ||
227 | - label: '需求', | ||
228 | - children: requirementsText, // 需求文本 | ||
229 | - }, | ||
230 | - { | ||
231 | key: '10', | 222 | key: '10', |
232 | label: '客户等级', | 223 | label: '客户等级', |
233 | children: levelText, // 客户等级文本 | 224 | children: levelText, // 客户等级文本 |
src/pages/Client/Client/Components/InformationHistoryModal.tsx
@@ -30,7 +30,6 @@ export default ({ data, reloadTable }) => { | @@ -30,7 +30,6 @@ export default ({ data, reloadTable }) => { | ||
30 | const [ticketsType, setTicketsType] = useState(''); // 附件名称 | 30 | const [ticketsType, setTicketsType] = useState(''); // 附件名称 |
31 | const [ticketsDetail, setTicketsDetail] = useState(''); // 附件名称 | 31 | const [ticketsDetail, setTicketsDetail] = useState(''); // 附件名称 |
32 | const [ticketsAttachment, setTicketsAttachment] = useState(''); // 附件名称 | 32 | const [ticketsAttachment, setTicketsAttachment] = useState(''); // 附件名称 |
33 | - const [setTicketsAttachmentName] = useState(''); // 附件名称 | ||
34 | const [assignPeople, setAssignPeople] = useState(''); // 附件名称 | 33 | const [assignPeople, setAssignPeople] = useState(''); // 附件名称 |
35 | 34 | ||
36 | useEffect(() => { | 35 | useEffect(() => { |
@@ -65,18 +64,6 @@ export default ({ data, reloadTable }) => { | @@ -65,18 +64,6 @@ export default ({ data, reloadTable }) => { | ||
65 | } | 64 | } |
66 | } | 65 | } |
67 | 66 | ||
68 | - if (dataSearch.ticketsAttachments) { | ||
69 | - const url = dataSearch.ticketsAttachments; | ||
70 | - const match = url.match(/aliyuncs\.com\/(.*?)\?/); | ||
71 | - let decodedStr = ''; | ||
72 | - | ||
73 | - if (match) { | ||
74 | - // 获取匹配的字符串并进行解码 | ||
75 | - const encodedStr = match[1]; | ||
76 | - decodedStr = decodeURIComponent(encodedStr); | ||
77 | - setTicketsAttachmentName(decodedStr); | ||
78 | - } | ||
79 | - } | ||
80 | setTicketsType(resTicket.data.type); | 67 | setTicketsType(resTicket.data.type); |
81 | setTicketsDetail(resTicket.data.detailText); | 68 | setTicketsDetail(resTicket.data.detailText); |
82 | setTicketsAttachment(resTicket.data.annexUrl); | 69 | setTicketsAttachment(resTicket.data.annexUrl); |
@@ -242,7 +229,7 @@ export default ({ data, reloadTable }) => { | @@ -242,7 +229,7 @@ export default ({ data, reloadTable }) => { | ||
242 | <img | 229 | <img |
243 | src={attachments} | 230 | src={attachments} |
244 | alt={attachmentsName} | 231 | alt={attachmentsName} |
245 | - style={{ maxWidth: '100%', height: 'auto' }} | 232 | + style={{ maxWidth: '1000px', height: 'auto' }} |
246 | /> | 233 | /> |
247 | <div></div> | 234 | <div></div> |
248 | <a href={attachments} download> | 235 | <a href={attachments} download> |
@@ -271,7 +258,7 @@ export default ({ data, reloadTable }) => { | @@ -271,7 +258,7 @@ export default ({ data, reloadTable }) => { | ||
271 | <img | 258 | <img |
272 | src={ticketsAttachment} | 259 | src={ticketsAttachment} |
273 | alt={ticketsAttachment} | 260 | alt={ticketsAttachment} |
274 | - style={{ maxWidth: '100%', height: 'auto' }} | 261 | + style={{ maxWidth: '1000px', height: 'auto' }} |
275 | /> | 262 | /> |
276 | <div></div> | 263 | <div></div> |
277 | <a href={ticketsAttachment} download> | 264 | <a href={ticketsAttachment} download> |
src/pages/Client/FollowRecord/Components/CommunicationHistoryModal.tsx
@@ -237,7 +237,7 @@ export default ({ data, reloadTable }) => { | @@ -237,7 +237,7 @@ export default ({ data, reloadTable }) => { | ||
237 | }} | 237 | }} |
238 | > | 238 | > |
239 | <Descriptions items={items} column={1} /> | 239 | <Descriptions items={items} column={1} /> |
240 | - {attachmentsName && ( | 240 | + {/* {attachmentsName && ( |
241 | <a href={attachments} download> | 241 | <a href={attachments} download> |
242 | 附件:{attachmentsName} | 242 | 附件:{attachmentsName} |
243 | </a> | 243 | </a> |
@@ -247,6 +247,57 @@ export default ({ data, reloadTable }) => { | @@ -247,6 +247,57 @@ export default ({ data, reloadTable }) => { | ||
247 | <a href={ticketsAttachment} download> | 247 | <a href={ticketsAttachment} download> |
248 | 工单附件:{ticketsAttachment} | 248 | 工单附件:{ticketsAttachment} |
249 | </a> | 249 | </a> |
250 | + )} */} | ||
251 | + {attachmentsName && ( | ||
252 | + <div> | ||
253 | + {attachmentsName.endsWith('.png') || | ||
254 | + attachmentsName.endsWith('.jpg') ? ( | ||
255 | + <> | ||
256 | + <img | ||
257 | + src={attachments} | ||
258 | + alt={attachmentsName} | ||
259 | + style={{ maxWidth: '1000px', height: 'auto' }} | ||
260 | + /> | ||
261 | + <div></div> | ||
262 | + <a href={attachments} download> | ||
263 | + 附件:{attachmentsName} | ||
264 | + </a> | ||
265 | + </> | ||
266 | + ) : ( | ||
267 | + <a href={attachments} download> | ||
268 | + 附件:{attachmentsName} | ||
269 | + </a> | ||
270 | + )} | ||
271 | + </div> | ||
272 | + )} | ||
273 | + | ||
274 | + <div></div> | ||
275 | + {/* {ticketsAttachment && ( | ||
276 | + <a href={ticketsAttachment} download> | ||
277 | + 工单附件:{ticketsAttachment} | ||
278 | + </a> | ||
279 | + )} */} | ||
280 | + {ticketsAttachment && ( | ||
281 | + <div> | ||
282 | + {ticketsAttachment.includes('jpg') || | ||
283 | + ticketsAttachment.includes('png') ? ( | ||
284 | + <> | ||
285 | + <img | ||
286 | + src={ticketsAttachment} | ||
287 | + alt={ticketsAttachment} | ||
288 | + style={{ maxWidth: '1000px', height: 'auto' }} | ||
289 | + /> | ||
290 | + <div></div> | ||
291 | + <a href={ticketsAttachment} download> | ||
292 | + 工单附件:{ticketsAttachment} | ||
293 | + </a> | ||
294 | + </> | ||
295 | + ) : ( | ||
296 | + <a href={ticketsAttachment} download> | ||
297 | + 工单附件:{ticketsAttachment} | ||
298 | + </a> | ||
299 | + )} | ||
300 | + </div> | ||
250 | )} | 301 | )} |
251 | </ModalForm> | 302 | </ModalForm> |
252 | </Space> | 303 | </Space> |