From 8e9f556423b0e3a19ce70df2bca8c351035368b0 Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Thu, 12 Sep 2024 16:06:02 +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 | 104 +++++++++++++++++++++++++++++----------------------
1 files changed, 59 insertions(+), 45 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 056f38a..44283d7 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -128,19 +128,15 @@
const choosePrincipal = async (id) => {
- console.log(id, 'choosePrincipalId')
const res = await choosePrincipalApi(caseId, id)
if (res.type) {
- let data = res.data
- console.log(data, 'choosePrincipalchoosePrincipal')
+ getFeedbackInfo()
}
-
}
const getByIdRole = async () => {
- console.log(feedbackInfoData?.handleUserId, 'feedbackInfoData?.handleUserId')
const res = await getByIdRoleApi(feedbackInfoData?.handleUserId)
- if(res.type){
+ if (res.type) {
setPersonView(!personView)
setPersonData(res.data)
}
@@ -159,7 +155,6 @@
//新增、编辑办理理由
const saveFeedback = async (submitData) => {
- console.log(submitData, 'submitData1111')
if (submitData.id) {
//编辑
const res = await updateFeedbackApi({
@@ -189,7 +184,6 @@
const res = await getFeedbackInfoApi(caseId)
if (res.type) {
setFeedbackInfoData(() => res.data)
- console.log(res.data, 'res.data')
// getByIdRole();
}
}
@@ -226,6 +220,42 @@
setProgressData(res.data)
}
}
+
+ //提交请求
+ // const reauestSubmit = async (data) => {
+ // const response = await submitDispute(data)
+ // if (response.type) {
+ // Message.success('提交成功！')
+ // navigate(`/mediate/visit/visitWorkBench`, { replace: true })
+ // setCurrent(2)
+ // }
+ // }
+
+
+ // const handleSubmit = async () => {
+ // if (formRef.current) {
+ // formRef.current.validate(undefined, (errors, values) => {
+ // if (!errors) {
+ // const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
+ // const params = handleData(rest)
+ // $$.modalInfo({
+ // title: '提醒',
+ // content: '确定提交吗？',
+ // cancelText: '我再想想',
+ // onOk: () => {
+ // reauestSubmit({
+ // ...params,
+ // isSelfAccept: 0,
+ // isDraft: 0,
+ // operateType: 0,
+ // })
+ // },
+ // });
+ // }
+ // });
+ // }
+ // }
+
//添加办理记录
const addMark = () => {
@@ -306,7 +336,7 @@
return (
<>
- <div className='container'>
+ <div className='container' style={{ height: 'calc(-307px + 100vh)' }}>
<div className='container-top'>
<Col span={24}>
<Space size='small'>
@@ -326,7 +356,8 @@
<>
<div>{feedbackInfoData?.handleUserName}</div>
<img onClick={() => handlePersonView()} src={register} alt='' style={{ width: '14px', height: '14px', marginLeft: '8px', marginTop: '4px' }} />
- </> : '-'
+ </> :
+ <Button onClick={() => { setIsModalVisible(true); }} style={{ color: '#1A6FB8', marginTop: '-2px' }} type='outline'>选择</Button>
}
</div>
</Col>
@@ -336,7 +367,7 @@
</Col>
<Col span={8} style={{ display: 'flex' }}>
<div><div className="title-text">受理时间：</div></div>
- <div>{feedbackInfoData?.acceptTime}</div>
+ <div>{$$.minuteFormat(feedbackInfoData?.acceptTime)}</div>
</Col>
</Row>
@@ -344,7 +375,7 @@
<div className='container-bottom'>
<div className='container-bottom-left'>
- <Col span={24} style={{ marginBottom: '8px' }}>
+ <Col span={24} style={{}}>
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h5>办理反馈</h5>
</Space>
@@ -354,27 +385,7 @@
requiredSymbol={false}
scrollToFirstError={true}
>
- <Col span={8}>
- <FormItem label={<div style={{ display: 'flex' }}>
- <span style={{ color: '#86909C' }}>经办人</span>
- <Tooltip>
- <img src={question1} alt="" style={{ width: '13px', height: '13px', margin: '4px 4px 0px 4px' }} />
- </Tooltip>
- </div>
- }
- field='level' >
- {wantUser.wantUserId ?
- <WantUserTag name={wantUser.wantUserName} onClose={() => setWantUser({ wantUserId: null, wantUserName: null })} />
- :
- 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>
- }
- </FormItem>
- </Col>
<Col span={24}>
- <div style={{ color: 'rgb(134, 144, 156)' }}>办理记录</div>
<HandleRecord isReview={false} handleEdit={handleEdit} data={list} />
{/* {formView && */}
<div className='Form' style={{ display: formView ? '' : 'none' }}>
@@ -444,26 +455,31 @@
{/* } */}
</Col>
</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' }} onClick={() => uniteHandle()}>联合处置申请</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={() => handleCaseResultApply()} >结案申请</Button>
- <Button type='outline' style={{ color: '#EF6C24', border: '1px solid #EF6C24' }} onClick={() => Supervising()}>督办</Button>
- <Button type='secondary' onClick={() => navigate(-1)}>返回上级页面</Button>
- </Space>
+ {!formView &&
+ <div className="dataSync-excel">
+ <Space size="middle" style={{ margin: '4px 14px' }}>
+ <Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={() => addMark()}>添加办理记录</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={() => handleCaseResultApply()} >结案申请</Button>
+ <Button type='outline' style={{ color: '#EF6C24', border: '1px solid #EF6C24' }} onClick={() => Supervising()}>督办</Button>
+ <Button type='secondary' onClick={() => navigate(-1)}>返回上级页面</Button>
+ </Space>
+ </div>
+
+ }
</div>
<div className='container-bottom-right'>
<Tabs defaultActiveTab='1' className='tabs-container' >
<TabPane
key='1'
title={
- <span style={{ fontSize: '15px' }}>
+ <span style={{ fontSize: '15px', paddingTop: '-16px' }}>
流转进度
</span>
}
>
<Typography.Paragraph>
- <div className='progress'>
+ <div className='progress' style={{ paddingBottom: '16px' }}>
<ProgressStep progressData={progressData} hasTab={true} />
</div>
@@ -513,11 +529,9 @@
visible={isModalVisible}
checkKeys={wantUser.wantUserId ? [{ label: wantUser.wantUserName, value: wantUser.wantUserId }] : undefined}
onOk={(value) => {
- console.log(value, 'value')
- console.log(value.key, value, 'value.key', 'value')
setIsModalVisible(false);
setWantUser({ wantUserId: value.keys[0], wantUserName: value.items[0].name });
- handleCheckedKeys(value.keys?.[0])
+ handleCheckedKeys(value.keys?.[0]);
}}
onClose={() => setIsModalVisible(false)}
@@ -574,7 +588,7 @@
allowClear
>
{options.map((option) => (
- <Option key={option.value} value={option.value} onChange={(v) => console.log(v, 'vvvvvv')}>
+ <Option key={option.value} value={option.value}>
{option.label}
</Option>
))}
--
Gitblit v1.8.0