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/views/register/handleFeedback/component/CaseResult.jsx | 124 +++++++++++++++++++---------------------
1 files changed, 59 insertions(+), 65 deletions(-)
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
index a2a9fd8..66eba3e 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
@@ -40,22 +40,14 @@
const failRef = useRef();
const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab
const [scanFile, setScanFile] = useState(false);
- const [selectedTab1, setSelectedTab1] = useState('1'); // 默认选中第一个 tab
- const [fileTip, setFileTip] = useState('0');
- const [value, setValue] = useState(1)
+ const [value, setValue] = useState(2)
const [noHandleReason, setNoHandleReason] = useState(false);
- const [radioValue, setRadioValue] = useState(1);
const [mode, setMode] = useState(false)
const tabs = [
{ index: '1', label: '化解成功' },
{ index: '2', label: '化解不成功' },
];
-
- const tabs1 = [
- { index: '1', label: '公共模板1：化解成功结案意见范本' },
- { index: '2', label: '个人模板1：化解成功结案意见范本（完整版）' }
- ]
const agreement = [
{ value: 1, label: '口头协议' },
@@ -65,10 +57,6 @@
const handleTabChange = (newTabIndex) => {
setSelectedTab(newTabIndex);
- };
-
- const handleTabChange1 = (newTabIndex) => {
- setSelectedTab1(newTabIndex);
};
const handleConfirm = (scanContent) => {
@@ -116,53 +104,57 @@
}
}
+ //化解成功的提交处理
const handleSubmit = () => {
+ //口头协议
if (value === 1) {
- const data = formRef?.current.getFields()
- console.log(data, 'handleSubmit')
- windupApply(data)
+ formRef?.current.validate(undefined, (errors, values) => {
+ if (!errors) {
+ const data = formRef?.current.getFields()
+ windupApply({
+ agreeType: '24_00003-1',
+ agreeTypeName: '口头协议',
+ ...data
+ })
+ }
+ })
}
+ //书面协议
if (value === 2) {
- const data = formRefWrite?.current.getFields()
- console.log(data, 'handleSubmit')
- windupApply(data)
+ formRefWrite?.current.validate(undefined, (errors, values) => {
+ if (!errors) {
+ const { file, ...rest } = formRefWrite?.current.getFields()
+ windupApply({
+ agreeType: '24_00003-2',
+ agreeTypeName: '书面协议',
+ ...rest
+ })
+ }
+ })
}
- if (selectedTab === '2') {
- const data = failRef?.current.getFields()
- console.log(data, 'handleSubmit')
- // windupApply(data)
-
-
- }
-
}
+
+ //化解不成功的提交处理
const handleSubmit1 = () => {
- if (selectedTab === '2') {
- const data = failRef?.current.getFields()
- console.log(data, 'handleSubmit')
- windupApply(data)
- }
+ failRef?.current.validate(undefined, (errors, values) => {
+ if (!errors) {
+ const { failReason1, failReason2, failReason3, ...rest } = failRef?.current.getFields()
+ const failReason = `1、${failReason1}；2、${failReason2}；3、${failReason3}。`
+ windupApply({
+ failReason: failReason,
+ ...rest
+ })
+ }
+ })
}
+ //结案申请请求
const windupApply = async (submitData) => {
- console.log(
- {
- mediResultName: selectedTab === '1' ? '化解成功' : '化解不成功',
- mediResult: selectedTab === '1' ? '22_00025-1' : '22_00025-2',
- agreeType: selectedTab === '1' ? '24_00003-1' : '24_00003-2',
- agreeTypeName: value === 1 ? '口头协议' : '书面协议',
- caseTaskId: caseTaskId,
- caseId: caseId,
- caseResultId: caseResultId,
- ...submitData
- }, 'windupApplyData'
- )
+ console.log(submitData);
const res = await windupApplyApi({
mediResultName: selectedTab === '1' ? '化解成功' : '化解不成功',
mediResult: selectedTab === '1' ? '22_00025-1' : '22_00025-2',
- agreeType: selectedTab === '1' ? '24_00003-1' : '24_00003-2',
- agreeTypeName: value === 1 ? '口头协议' : '书面协议',
caseTaskId: caseTaskId,
caseId: caseId,
caseResultId: caseResultId,
@@ -213,7 +205,7 @@
scrollToFirstError={true}
requiredSymbol={false}
initialValues={{
- agreeType: 2,
+ agreeType: value,
}} //默认值
>
<Col span={8}>
@@ -224,7 +216,7 @@
}
field='agreeType'
>
- <Select options={agreement} onChange={(v) => { setValue(v); console.log(typeof v, 'vvv') }}>
+ <Select options={agreement} onChange={(v) => { setValue(v); }}>
</Select>
</FormItem>
</Col>
@@ -247,7 +239,7 @@
<div className="must">必填</div>
</div>
<div className='caseResult-tips'>
- <img src={tip} alt='' style={{ width: '16px', marginRight: '8px',marginTop: '-5px' }} />
+ <img src={tip} alt='' style={{ width: '16px', marginRight: '8px', marginTop: '-5px' }} />
<span>协议要点应尽量简洁，当事人大厅来访或小程序线上反映问题时，可在小程序中查看到填写的协议要点内容</span>
</div>
<div style={{ position: 'absolute', display: 'flex ', top: '79px', zIndex: 1 }}>
@@ -262,6 +254,7 @@
</>
)}
field='agreeContent'
+ rules={[{ message: '请填写协议要点', required: true }]}
>
<TextArea
autoSize={{ minRows: 4, maxRows: 8 }}
@@ -289,6 +282,7 @@
<FormItem
label={(<div style={{ display: 'flex' }}>结案意见<div className="must">必填</div></div>)}
field='windupContent'
+ rules={[{ message: '请填写结案意见', required: true }]}
>
<TextArea
autoSize={{ minRows: 4, maxRows: 8 }}
@@ -312,7 +306,14 @@
>
<Row>
<Col span={24}>
- <FormItem
+ <ArcoUpload
+ params={{
+ action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${caseId}&ownerId=${caseResultId}&ownerType=22_00018-302`,
+ }}
+ formItemParams={{
+ rules: [{ message: '请上传协议文书', required: true }]
+ }}
+ field='file'
label={
<>
<div style={{ display: 'flex' }}>
@@ -325,19 +326,8 @@
</div>
</>
}
- field='caseDes'
- rules={[{ message: '请填写事项概况', required: true }]}
- >
- <ArcoUpload
- params={{
- action: `${appUrl.fileUrl}/${appUrl.sys}/api/web/fileInfo/upload?mainId=${caseId}&ownerId=${caseResultId}&ownerType=22_00018-302`,
- }}
- field='file'
- label=''
- // editData={props.editData}
- ownerType='22_00018-302'
- />
- </FormItem>
+ ownerType='22_00018-302'
+ />
</Col>
<Col span={24} style={{ position: 'relative' }}>
<div style={{ position: 'absolute', display: 'flex', top: '28px', zIndex: 1 }}>
@@ -359,6 +349,7 @@
<FormItem
label={(<div style={{ display: 'flex' }}>结案意见<div className="must">必填</div></div>)}
field='windupContent'
+ rules={[{ message: '请填写结案意见', required: true }]}
>
<TextArea
autoSize={{ minRows: 4, maxRows: 8 }}
@@ -370,7 +361,6 @@
</Row>
</Form>
</>
-
}
<Space style={{ marginBottom: '16px' }}>
<Button type='primary' onClick={handleSubmit}>提交</Button>
@@ -409,6 +399,7 @@
<FormItem
label=''
field='failReason1'
+ rules={[{ message: '请填写调解过程中提供的解决方案', required: true }]}
>
<Input.TextArea
showWordLimit
@@ -425,6 +416,7 @@
<FormItem
label=''
field='failReason2'
+ rules={[{ message: '请填写调解过程中的主要分歧点', required: true }]}
>
<Input.TextArea
showWordLimit
@@ -441,6 +433,7 @@
<FormItem
label=''
field='failReason3'
+ rules={[{ message: '请填写最终难以调和的原因', required: true }]}
>
<Input.TextArea
showWordLimit
@@ -460,6 +453,7 @@
<FormItem
label={(<div style={{ display: 'flex' }}>结案意见<div className="must">必填</div></div>)}
field='windupContent'
+ rules={[{ message: '请填写结案意见', required: true }]}
>
<TextArea
autoSize={{ minRows: 4, maxRows: 8 }}
@@ -470,7 +464,7 @@
</Col>
<Space style={{ marginBottom: '16px' }}>
<Button type='primary' onClick={handleSubmit1}>提交</Button>
- <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }}>保存</Button>
+ {/* <Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }}>保存</Button> */}
</Space>
</Form>
}
--
Gitblit v1.8.0