From 48338f6e5bd42fc3617d44c49aa825046e1f1730 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 11 Sep 2024 12:43:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 75c8885..056f38a 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -138,9 +138,12 @@
}
const getByIdRole = async () => {
- const res = await getByIdRoleApi(caseId)
- setPersonData(res.data)
-
+ console.log(feedbackInfoData?.handleUserId, 'feedbackInfoData?.handleUserId')
+ const res = await getByIdRoleApi(feedbackInfoData?.handleUserId)
+ if(res.type){
+ setPersonView(!personView)
+ setPersonData(res.data)
+ }
}
@@ -184,8 +187,11 @@
const getFeedbackInfo = async () => {
const res = await getFeedbackInfoApi(caseId)
- setFeedbackInfoData(res.data)
- console.log(res.data, 'res.data')
+ if (res.type) {
+ setFeedbackInfoData(() => res.data)
+ console.log(res.data, 'res.data')
+ // getByIdRole();
+ }
}
//获取办理记录接口
@@ -266,7 +272,7 @@
}
const handlePersonView = () => {
- setPersonView(!personView)
+ getByIdRole();
}
@@ -280,7 +286,6 @@
listFeedback(caseId);
getData(caseId)
getFeedbackInfo();
- getByIdRole();
}, [])
// useEffect(() => {
@@ -316,8 +321,13 @@
<Col span={8} style={{ display: 'flex' }}>
<div><div className="title-text">经办人：</div></div>
<div style={{ display: 'flex' }}>
- <div>{feedbackInfoData?.handleUserName}</div>
- <img onClick={() => handlePersonView()} src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} />
+ {
+ feedbackInfoData?.handleUserName ?
+ <>
+ <div>{feedbackInfoData?.handleUserName}</div>
+ <img onClick={() => handlePersonView()} src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} />
+ </> : '-'
+ }
</div>
</Col>
<Col span={8} style={{ display: 'flex' }}>
@@ -359,7 +369,7 @@
caseId && managerName ?
<WantUserTag name={managerName} onClose={() => setWantUser({ wantUserId: null, wantUserName: null })} />
:
- <Button onClick={() => setIsModalVisible(true)} style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} type='outline'>选择</Button>
+ <Button onClick={() => { setIsModalVisible(true); }} style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} type='outline'>选择</Button>
}
</FormItem>
</Col>
@@ -400,7 +410,6 @@
wrapperStyle={{ width: '100%' }}
/>
</FormItem>
-
</Col>
<Col span={24}>
<FormItem
@@ -413,7 +422,7 @@
>
<ArcoUpload
params={{
- action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${caseId}&ownerId=${caseId}&ownerType=${'22_00018-501'}`,
+ action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${caseId}&ownerId=${id}&ownerType=${'22_00018-501'}`,
}}
field='file1'
// handleChangeFile={handleChangeFile}
@@ -509,6 +518,7 @@
setIsModalVisible(false);
setWantUser({ wantUserId: value.keys[0], wantUserName: value.items[0].name });
handleCheckedKeys(value.keys?.[0])
+
}}
onClose={() => setIsModalVisible(false)}
type='person'
@@ -535,7 +545,7 @@
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">所属部门</th>
- <td>{personData?.deptName}</td>
+ <td>{personData?.unitName}</td>
<th bgcolor="#F7F8FA" className="table-title">职务</th>
<td>{personData?.userRoles}</td>
</tr>
--
Gitblit v1.8.0