From 5aa4a814ab8d4aa194a9683ebefaefdfc6d92c3a Mon Sep 17 00:00:00 2001
From: liuwh <964324856@qq.com>
Date: Tue, 17 Sep 2024 17:18:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh into master
---
gz-customerSystem/src/components/personCard/DetailDialog.jsx | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/gz-customerSystem/src/components/personCard/DetailDialog.jsx b/gz-customerSystem/src/components/personCard/DetailDialog.jsx
index 814f556..2a94e1c 100644
--- a/gz-customerSystem/src/components/personCard/DetailDialog.jsx
+++ b/gz-customerSystem/src/components/personCard/DetailDialog.jsx
@@ -326,14 +326,19 @@
return {
...res,
value: <>
- {data[res.field]?.map(item => {
- console.log(item);
- if(item.response) {
+ {data[res.field]?.map((item, index) => {
+ if (item.response) {
//新上传的，前端数据
- const data = item.response.data[0]
- return <PreviewImage name={data.name} src={data.showUrl} />
+ const newData = item.response.data[0]
+ return <div style={{ display: 'inline-block' }}>
+ <PreviewImage name={newData.name} src={newData.showUrl} />
+ {index !== data[res.field].length - 1 && <>，</>}
+ </div>
} else {
- return <PreviewImage name={item.name} src={item.showUrl} />
+ return <div style={{ display: 'inline-block' }}>
+ <PreviewImage name={item.name} src={item.showUrl} />
+ {index !== data[res.field].length - 1 && <>，</>}
+ </div>
}
})}
</>
@@ -352,6 +357,11 @@
...res,
value: filterValue
}
+ } else if (res.field === 'extreme') {
+ return {
+ ...res,
+ value: data[res.field] === 0 ? '否' : '是'
+ }
} else {
return {
...res,
--
Gitblit v1.8.0