From 5424fb6cc7c907ec12025e96bb41146b28e5582c Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sun, 08 Sep 2024 10:00:34 +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 | 92 ++++++++++++++++++++++++++++++++--------------
1 files changed, 64 insertions(+), 28 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 039692d..0340129 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -1,6 +1,6 @@
import React, { useState, useRef, useEffect } from 'react';
import { Col, Space, Row, Tooltip } from 'antd';
-import { register,} from '@/assets/images';
+import { register, aiPerson } from '@/assets/images';
import { Form, Input, Tabs, Typography, Button, Modal, Select } from '@arco-design/web-react';
import { question1, } from '@/assets/images';
import ProgressStep from '@/components/ProgressStep/VisitStep';
@@ -13,6 +13,7 @@
import ArcoUpload from '@/components/ArcoUpload';
import HandleRecord from '../../matterDetail/HandleRecord';
import SupervisingView from '../../matterDetail/Supervising'
+import UniteHandle from '../../matterDetail/UniteHandle';
const Option = Select.Option;
@@ -99,7 +100,13 @@
return $$.ax.request({ url: `caseFeedback/updateFeedback`, type: 'post', service: 'mediate', data });
}
+function getFeedbackInfoApi(caseTaskId) {
+ return $$.ax.request({ url: `caseFeedback/getFeedbackInfo?caseTaskId=` + caseTaskId, type: 'get', service: 'mediate' });
+}
+function getByIdRoleApi(id) {
+ return $$.ax.request({ url: `ctUser/getByIdRole?id=` + id, type: 'get', service: 'cust' });
+}
@@ -107,20 +114,21 @@
const formRef = useRef();
const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab
const [selectedTab1, setSelectedTab1] = useState('1'); // 默认选中第一个 tab
-
-
const [wantUser, setWantUser] = useState({});
const [formView, setFormView] = useState(false);
const [personView, setPersonView] = useState(false);
const [supervising, setSupervising] = useState(false)
const [data, setData] = useState({})
+ const [feedbackInfoData, setFeedbackInfoData] = useState({})
+ const [personData, setPersonData] = useState({})
const [caseResult, SetCaseResult] = useState(false);
- const [response, setResponse] = useState('')
const [list, setList] = useState([]);
const [mode, SetMode] = useState(false);
- const [modeDetail, setModeDetail] = useState(false);
- const [radioValue, setRadioValue] = useState('')
- const [detail, setDetail] = useState(false);
+ const [uniteHandleView, setUniteHandleView] = useState(false);
+ const [isModalVisible, setIsModalVisible] = useState(false);
+ const [id, setId] = useState('');
+ const [uniteHandleId, setUniteHandleId] = useState('');
+
const tabs = [
{ index: '1', label: '承办部门' },
@@ -140,8 +148,6 @@
{ index: '1', label: '公共模板1：回复督办内容收到通用范本' },
]
- const [isModalVisible, setIsModalVisible] = useState(false);
- const [id, setId] = useState('')
const handleTabChange = (newTabIndex) => {
setSelectedTab(newTabIndex);
@@ -178,6 +184,12 @@
}
+ const getByIdRole = async () => {
+ const res = await getByIdRoleApi('2105180249501982')
+ setPersonData(res.data)
+
+ }
+
//删除文件
const handleDelFile = async (id) => {
@@ -204,7 +216,7 @@
} else {
const res = await saveFeedbackApi({
...submitData,
- caseId: '24083010062110001',
+ caseId: "24083010062110001",
id: id,
caseTaskId: '',
})
@@ -213,6 +225,12 @@
listFeedback('24083010062110001')
}
}
+ }
+
+ const getFeedbackInfo = async () => {
+ const res = await getFeedbackInfoApi('24083010062110001')
+ setFeedbackInfoData(res.data)
+ console.log(res.data, 'res.data')
}
//获取办理记录接口
@@ -225,17 +243,21 @@
}
//获取理由id
- const getNewTimeId = async () => {
+ const getNewTimeId = async (type) => {
const res = await getNewTimeIdApi()
if (res.type) {
- setId(res.data)
+ if (type === 'uniteHandle') {
+ setUniteHandleId(res.data)
+ }
+ if (type === 'addMark')
+ setId(res.data)
}
}
//添加办理记录
const addMark = () => {
setFormView(!formView);
- getNewTimeId()
+ getNewTimeId('addMark')
}
//保存信息
@@ -257,6 +279,13 @@
setSupervising(!supervising)
}
+ const uniteHandle = () => {
+ getNewTimeId('uniteHandle')
+ setUniteHandleView(!uniteHandleView)
+ }
+
+
+
const handleTabChange1 = (newTabIndex) => {
setSelectedTab1(newTabIndex);
};
@@ -269,10 +298,16 @@
setSupervising(!supervising)
}
+ const handlePersonView = () => {
+ setPersonView(!personView)
+
+ }
+
useEffect(() => {
listFeedback('24083010062110001');
- // getByIdRole()
+ getFeedbackInfo();
+ getByIdRole();
}, [])
@@ -288,22 +323,22 @@
<Row gutter={[16, 16]}>
<Col span={8} style={{ display: 'flex' }}>
<div><div className="title-text">承办部门：</div></div>
- <div>天河区棠下街综治中心</div>
+ <div>{feedbackInfoData?.handleUnitName}</div>
</Col>
<Col span={8} style={{ display: 'flex' }}>
<div><div className="title-text">经办人：</div></div>
<div style={{ display: 'flex' }}>
- <div>王一顺</div>
- <img onClick={() => setPersonView(!personView)} src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} />
+ <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' }}>
<div><div className="title-text">配合部门：</div></div>
- <div>-</div>
+ <div>{feedbackInfoData?.assistUnitName}</div>
</Col>
<Col span={8} style={{ display: 'flex' }}>
<div><div className="title-text">受理时间：</div></div>
- <div>2024-7-5 11:45</div>
+ <div>{feedbackInfoData?.acceptTime}</div>
</Col>
</Row>
@@ -387,7 +422,7 @@
>
<ArcoUpload
params={{
- action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId='24083010062110001'&&ownerId=${id}&ownerType=22_00018-102`,
+ action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${'24083010062110001'}&ownerId=${id}&ownerType=${'22_00018-501'}`,
}}
field='file1'
// handleChangeFile={handleChangeFile}
@@ -411,7 +446,7 @@
</Form>
<Space style={{ marginTop: '38px', bottom: '4px' }}>
<Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={() => addMark()}>添加办理记录</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }}>联合处置申请</Button>
+ <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => uniteHandle()}>联合处置申请</Button>
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => SetCaseResult(!caseResult)}>结案申请</Button>
<Button type='outline' style={{ color: '#EF6C24', border: '1px solid #EF6C24' }} onClick={() => Supervising()}>督办</Button>
<Button type='secondary'>返回上级页面</Button>
@@ -491,21 +526,21 @@
<table border="1" align="center" cellpadding="5" className="table">
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">姓名</th>
- <td width='380'><div style={{ display: 'flex' }}><div>{data.trueName}</div></div></td>
+ <td width='380'><div style={{ display: 'flex' }}><div>{personData?.trueName}</div></div></td>
<th bgcolor="#F7F8FA" className="table-title" width="120">登录账号</th>
- <td width='380'>{data.acc}</td>
+ <td width='380'>{personData?.acc}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">手机号码</th>
- <td>{data.mobile}</td>
+ <td>{personData?.mobile}</td>
<th bgcolor="#F7F8FA" className="table-title">工作电话</th>
- <td>020-83002020</td>
+ <td>-</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title">所属部门</th>
- <td>{data.deptName}</td>
+ <td>{personData?.deptName}</td>
<th bgcolor="#F7F8FA" className="table-title">职务</th>
- <td>主任</td>
+ <td>{personData?.userRoles}</td>
</tr>
</table>
</Modal>
@@ -523,7 +558,7 @@
<Col span={24}>
<FormItem
label={<div style={{ display: 'flex' }}><div>督办部门</div><div style={{ color: '#86909C' }}>（可多选）</div></div>}
- field='caseDes'
+ field=''
>
<Select
mode='multiple'
@@ -593,6 +628,7 @@
</Row>
</Form>
</Modal>
+ <UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} />
<CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} />
</div>
--
Gitblit v1.8.0