From 2ef19aff2a07ec697c1f1c672fbb2bf82cafacc0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Sat, 17 Aug 2024 18:21:27 +0800
Subject: [PATCH] 合并冲突
---
gz-customerSystem/src/views/register/visit/preview.jsx | 84 +++++++++++++++++++++++------------------
1 files changed, 47 insertions(+), 37 deletions(-)
diff --git a/gz-customerSystem/src/views/register/visit/preview.jsx b/gz-customerSystem/src/views/register/visit/preview.jsx
index 1c34ede..9caef71 100644
--- a/gz-customerSystem/src/views/register/visit/preview.jsx
+++ b/gz-customerSystem/src/views/register/visit/preview.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-13 15:19:57
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-08-16 17:09:12
+ * @LastEditTime: 2024-08-17 17:03:50
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\preview.jsx
* @Description: 预览信息
*/
@@ -27,7 +27,7 @@
caseNo: 'A20230101',
judicNo: '申请材料',
perClassName: '李晓明的纠纷化解申请表、身份证...',
- inputUserName: '张三',
+ inputUserName: '0',
mediateUserName: '2024-7-12 12:00',
judgeName: '王五',
mediator: '赵六',
@@ -48,7 +48,7 @@
caseNo: 'A20230101',
judicNo: '证据材料',
perClassName: '李晓明的纠纷化解申请表、身份证...',
- inputUserName: '张三',
+ inputUserName: '0',
mediateUserName: '2024-7-12 12:00',
judgeName: '王五',
mediator: '赵六',
@@ -74,7 +74,7 @@
title: '序号',
dataIndex: 'caseNo',
key: 'caseNo',
- width: 60,
+ width: 100,
render: (text, record, index) => <span>{index + 1}</span>,
},
{
@@ -89,6 +89,11 @@
dataIndex: 'inputUserName',
key: 'perClassName',
width: 180,
+ render: (text) => (
+ <>
+ {text}份
+ </>
+ )
},
{
@@ -134,33 +139,38 @@
<div className="line middle-line"></div>
<div className="line right-line"></div>
</div>
- <table border="1" align="center" cellpadding="8" className="table">
+ <table border="1" align="center" cellpadding="6" className="table">
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">姓名</th>
<td width='380'><div style={{ display: 'flex' }}><div>李晓明</div><div className="title-personRemark">自然人</div></div></td>
<th bgcolor="#F7F8FA" className="table-title" width="120">联系方式</th>
- <td width='380'>19</td>
+ <td width='380'>13591990202</td>
<th bgcolor="#F7F8FA" className="table-title" width='140'>性别</th>
- <td>汉</td>
+ <td>女</td>
<td rowspan="4" width="112" height='147' style={{ padding: '0px' }}>
- <img border="0" src={person} alt="" style={{ width: '100%', height: '100%' }} />
+ <img border="0" src={person} alt="" style={{
+ width: '100%',
+ height: '100%',
+ objectFit: 'cover', // 保持原始宽高比并填充整个容器
+ objectPosition: 'center', // 图片居中显示
+ }} />
</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">证件类型</th>
- <td>19970000</td>
+ <td>身份证</td>
<th bgcolor="#F7F8FA" className="table-title">证件号码</th>
- <td>团员</td>
+ <td>410106198802021148</td>
<th bgcolor="#F7F8FA" className="table-title">民族</th>
- <td>本科</td>
+ <td>汉族</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">联系地址</th>
- <td>网络工程</td>
+ <td>广东科贸服务有限公司</td>
<th bgcolor="#F7F8FA" className="table-title">户籍地址</th>
- <td>淮南师范学院</td>
+ <td>广州市天河区棠下街120号</td>
<th bgcolor="#F7F8FA" className="table-title" rowspan="2" >是否有个人极端倾向</th>
- <td rowspan="2" >237483</td>
+ <td rowspan="2" >否</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">工作单位</th>
@@ -173,49 +183,49 @@
</td>
</tr>
</table>
- <table border="1" align="center" cellpadding="8" className="table" style={{ marginTop: '20px', marginBottom: '20px' }}>
+ <table border="1" align="center" cellpadding="6" className="table" style={{ marginTop: '20px', marginBottom: '20px' }}>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">姓名</th>
<td width='380'><div style={{ display: 'flex' }}><div>李巧凤</div><div className="title-personRemark">代理人</div></div></td>
<th bgcolor="#F7F8FA" className="table-title" width="120">联系方式</th>
- <td width='380'>19</td>
+ <td width='380'>13591990202</td>
<th bgcolor="#F7F8FA" className="table-title" width="140">性别</th>
- <td>汉</td>
+ <td>女</td>
<td rowspan="4" width="112" height='147' style={{ padding: '0px' }}>
<img border="0" src={person} alt="" style={{ width: '100%', height: '100%' }} />
</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">证件类型</th>
- <td>19970000</td>
+ <td>身份证</td>
<th bgcolor="#F7F8FA" className="table-title">证件号码</th>
- <td>团员</td>
+ <td>410106198802021148</td>
<th bgcolor="#F7F8FA" className="table-title">民族</th>
- <td>本科</td>
+ <td>汉族</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">联系地址</th>
- <td>网络工程</td>
+ <td>广州市天河区棠下街120号</td>
<th bgcolor="#F7F8FA" className="table-title">户籍地址</th>
- <td>淮南师范学院</td>
+ <td>广州市天河区棠下街120号</td>
<th bgcolor="#F7F8FA" className="table-title" >是否有个人极端倾向</th>
- <td>237483</td>
+ <td>否</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">工作单位</th>
- <td>玩，拆，装</td>
+ <td>广东科贸服务有限公司</td>
<th bgcolor="#F7F8FA" className="table-title">委托关系</th>
- <td>皖</td>
+ <td>亲属</td>
<th bgcolor="#F7F8FA" className="table-title">委托类型</th>
- <td>皖</td>
+ <td>一般授权代理</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">代理对象</th>
- <td>玩，拆，装</td>
+ <td>李晓明</td>
<th bgcolor="#F7F8FA" className="table-title">身份证明材料</th>
<td>
<a href="your-link-here.html" target="_blank">
- <img src={link} alt="" className="title-file" />李晓明身份证明材料.pdf
+ <img src={link} alt="" className="title-file" />李巧凤身份证明材料.pdf
</a>
</td>
<th bgcolor="#F7F8FA" className="table-title">代理人授权委托书</th>
@@ -233,36 +243,36 @@
<div className="line middle-line"></div>
<div className="line right-line"></div>
</div>
- <table border="1" align="center" cellpadding="8" className="table" style={{ marginTop: '20px', marginBottom: '20px' }}>
+ <table border="1" align="center" cellpadding="6" className="table" style={{ marginTop: '20px', marginBottom: '20px' }}>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">企业名称</th>
<td width='380'><div style={{ display: 'flex' }}><div>广东好又多贸易有限公司</div><div className="title-personRemark">法人</div></div></td>
<th bgcolor="#F7F8FA" className="table-title" width="120">联系方式</th>
- <td width='380'>19</td>
+ <td width='380'>13091990202</td>
<th bgcolor="#F7F8FA" className="table-title" width="120">企业所在地</th>
- <td>汉</td>
+ <td>广州市天河区棠下街120号</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">企业类型</th>
- <td>19970000</td>
+ <td>餐饮服务</td>
<th bgcolor="#F7F8FA" className="table-title">法定代表人</th>
- <td>团员</td>
+ <td>江照月</td>
<th bgcolor="#F7F8FA" className="table-title">统一社会信用代码</th>
- <td>本科</td>
+ <td>914401015454Z</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">住所</th>
- <td>网络工程</td>
+ <td>广州市天河区棠下街120号</td>
<th bgcolor="#F7F8FA" className="table-title">企业登记材料</th>
<td>
<a href="your-link-here.html" target="_blank">
- <img src={link} alt="" className="title-file" />李晓明身份证明材料.pdf
+ <img src={link} alt="" className="title-file" />广东好又多贸易有限公司营业执照副本.pdf
</a>
</td>
<th bgcolor="#F7F8FA" className="table-title" >法定代表人身份证明材料</th>
<td>
<a href="your-link-here.html" target="_blank">
- <img src={link} alt="" className="title-file" />李晓明身份证明材料.pdf
+ <img src={link} alt="" className="title-file" />江照月法人身份证明.pdf
</a>
</td>
</tr>
--
Gitblit v1.8.0