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/matterDetail/HandleRecord.jsx | 10 +-
gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx | 2
gz-customerSystem/src/views/register/index.jsx | 10 +-
gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx | 103 +++++++++----------
gz-customerSystem/src/components/ProgressStep/VisitStep.jsx | 4
gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx | 2
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 104 +++++++++++---------
gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx | 2
gz-customerSystem/src/styles/theme.less | 2
gz-customerSystem/src/views/register/index.less | 24 +++-
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 6 +
gz-customerSystem/src/views/register/visit/preview.jsx | 6
gz-customerSystem/src/views/register/visit/index.jsx | 4
gz-customerSystem/src/utils/utility.js | 6 +
14 files changed, 155 insertions(+), 130 deletions(-)
diff --git a/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx b/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx
index 918b953..0dfa948 100644
--- a/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx
+++ b/gz-customerSystem/src/components/ProgressStep/VisitStep.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-29 14:57:06
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-08-29 15:58:19
+ * @LastEditTime: 2024-09-12 11:38:05
* @FilePath: \gzDyh\gz-customerSystem\src\components\ProgressStep\VisitStep.jsx
* @Description: 来访登记步骤条
*/
@@ -90,7 +90,7 @@
}
<div className="myStep-item-p" style={{ color: 'rgba(0,0,0,0.50)' }}>
<span>操作时间：</span>
- <span>{$$.timeFormat(x.handleTime, false, 'YYYY-MM-DD HH:mm')}</span>
+ <span>{$$.minuteFormat(x.handleTime)}</span>
</div>
{
x.handleNotes &&
diff --git a/gz-customerSystem/src/styles/theme.less b/gz-customerSystem/src/styles/theme.less
index 1d6201f..df1b3ac 100644
--- a/gz-customerSystem/src/styles/theme.less
+++ b/gz-customerSystem/src/styles/theme.less
@@ -16,7 +16,7 @@
@warning-color: #FA8C16; // 警告色
@warning-bg-color: #fdf6e0; // 警告色背景
@error-color: #F53F3F; // 错误色
-@font-size-base: 14px; // 主字号
+@font-size-base: 16px; // 主字号
@line-height-base: 1.5715;
@heading-color: rgba(0, 0, 0, 0.85); // 标题色
@text-color: rgba(0, 0, 0, 0.85); // 主文本色
diff --git a/gz-customerSystem/src/utils/utility.js b/gz-customerSystem/src/utils/utility.js
index 4728488..2ca8375 100644
--- a/gz-customerSystem/src/utils/utility.js
+++ b/gz-customerSystem/src/utils/utility.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:57:54
- * @LastEditTime: 2024-08-21 16:58:17
+ * @LastEditTime: 2024-09-12 10:55:38
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 公共模块方法
@@ -184,6 +184,10 @@
return !!value ? moment(value).format(timeFormat ? timeFormat : 'YYYY-MM-DD HH:mm:ss') : isValue ? '' : '-';
}
+export function minuteFormat(value, isValue) {
+ return !!value ? moment(value).format('YYYY-MM-DD HH:mm') : isValue ? '' : '-';
+}
+
export function dateFormat(value) {
return !!value ? moment(value).format('YYYY-MM-DD') : '-';
}
diff --git a/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx b/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
index 14fee11..63352ca 100644
--- a/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
+++ b/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
@@ -142,7 +142,7 @@
</Col>
<Col span={24}>
<div><div className="title-text">结案意见</div></div>
- <div>{infoData?.windupContent || '-'}</div>
+ <div>{infoData?.auditContent || '-'}</div>
</Col>
{/* <Col span={24}>
<div><div className="title-text">是否转诉讼案件</div></div>
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx b/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
index 3c4585c..f80c4bf 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
@@ -55,7 +55,7 @@
const handleTemplate = (type) => {
if (type === 1) {
- formRef.current.setFieldValue('assignContent', '本事项经初步核实，认为属于贵部门职责范围内的矛盾纠纷化解工作。请组织专门人员负责此事，尽快查明事实真相，依法依规进行处理，并在处理过程中充分考虑当事人的合理诉求，确保公平公正，维护当事人的合法权益。同时，请务必保持与当事人的沟通畅通，及时反馈办理进展，以增强矛盾纠纷化解工作的透明度和公信力。')
+ formRef.current.setFieldValue('assignContent', '本事项经初步核实，认为属于贵部门职责范围内的矛盾纠纷化解工作。请指定专人负责跟进此事，尽快核清事实，依法依规进行处理，并在处理过程中充分考虑当事人的合理诉求，确保公平公正，维护当事人的合法权益。同时，请务必做好与当事人的沟通解释，及时反馈办理进展，以增强矛盾纠纷化解工作的透明度和公信力')
} else {
formRef.current.setFieldValue('assignContent', '')
}
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index 2e7bc9f..a6756d8 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
@@ -218,7 +218,7 @@
<AssignedModel caseId={props.caseId} caseTaskId={props.caseTaskId} onCancel={() => { setAssignedVisible(false) }} />
</Modal>
<div className="dataSync-excel">
- <Space size="large" style={{ margin: '4px 14px' }}>
+ <Space size="middle" style={{ margin: '4px 14px' }}>
{staticButtonList?.map(item => {
const { label, key, click, ...rest } = item;
return <Button key={key} onClick={click} {...rest} >{label}</Button>
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
index 15a0d77..2bb49af 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-09-02 14:49:13
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-11 11:34:07
+ * @LastEditTime: 2024-09-12 12:03:56
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\handleFeedback\component\CaseResult.jsx
* @Description: 结案申请
*/
@@ -32,6 +32,9 @@
const CaseResult = ({ visible = false, handleOnCancel, caseResultId, caseId, caseTaskId }) => {
const formRef = useRef();
+ const [selectedTemplate, setSelectedTemplate] = useState();
+ const [selectedTemplate1, setSelectedTemplate1] = useState();
+ const [selectedTemplate2, setSelectedTemplate2] = useState();
const navigate = useNavigate();
const formRefWrite = useRef();
const failRef = useRef();
@@ -81,22 +84,25 @@
};
const handleTemplate = (type) => {
+ setSelectedTemplate(type);
if (type === 1) {
- formRef.current.setFieldValue('windupContent', '鉴于以上协议内容已经双方确认，并认为该协议内容公平合理，能够妥善解决双方的纠纷。建议双方当事人按照协议内容执行，以实现纠纷的最终解决。')
+ formRef.current.setFieldValue('windupContent', '双方当事人于xx时间xx地址已达成xx协议，纠纷已化解。')
} else {
formRef.current.setFieldValue('windupContent', '')
}
}
const handleTemplate1 = (type) => {
+ setSelectedTemplate1(type);
if (type === 1) {
formRef.current.setFieldValue('agreeContent', '根据纠纷化解人员的协调，当事人双方同意如下调解协议：[简要说明协议第一条][简要说明协议第二条][……]本口头调解协议由纠纷化解人员记录，并已告知双方当事人。双方当事人确认无误。')
}
}
const handleTemplate2 = (type) => {
+ setSelectedTemplate2(type);
if (type === 1) {
- formRefWrite.current.setFieldValue('windupContent', '鉴于以上协议内容已经双方确认，并认为该协议内容公平合理，能够妥善解决双方的纠纷。建议双方当事人按照协议内容执行，以实现纠纷的最终解决。')
+ formRefWrite.current.setFieldValue('windupContent', '双方当事人于xx时间xx地址已达成xx协议，纠纷已化解。')
} else {
formRefWrite.current.setFieldValue('windupContent', '')
}
@@ -241,11 +247,17 @@
<div className="must">必填</div>
</div>
<div className='caseResult-tips'>
- <img src={tip} alt='' style={{ width: '16px', marginRight: '8px' }} />
+ <img src={tip} alt='' style={{ width: '16px', marginRight: '8px',marginTop: '-5px' }} />
<span>协议要点应尽量简洁，当事人大厅来访或小程序线上反映问题时，可在小程序中查看到填写的协议要点内容</span>
</div>
<div style={{ position: 'absolute', display: 'flex ', top: '79px', zIndex: 1 }}>
- <div className='myTag' style={{ marginRight: '22px' }} onClick={() => { handleTemplate1(1) }}>公共模板：调解成功口头协议</div>
+ <div
+ className={`myTag ${selectedTemplate1 === 1 ? 'highlighted' : ''}`} // 条件样式
+ style={{ marginRight: '22px' }}
+ onClick={() => handleTemplate1(1)}
+ >
+ 公共模板:调解成功口头协议
+ </div>
</div>
</>
)}
@@ -259,9 +271,20 @@
</FormItem>
</Col>
<Col span={24} style={{ position: 'relative' }}>
- <div style={{ position: 'absolute', display: 'flex ', top: '28px', zIndex: 1 }}>
- <div className='myTag' style={{ marginRight: '22px' }} onClick={() => { handleTemplate(1) }}>公共模板：化解成功结案意见范本</div>
- <div className='myTag' onClick={() => { handleTemplate(2) }}>个人模板：化解成功结案意见范本（完整版）</div>
+ <div style={{ position: 'absolute', display: 'flex', top: '28px', zIndex: 1 }}>
+ <div
+ className={`myTag ${selectedTemplate === 1 ? 'highlighted' : ''}`} // 条件样式
+ style={{ marginRight: '22px' }}
+ onClick={() => handleTemplate(1)}
+ >
+ 公共模板：化解成功结案意见范本
+ </div>
+ <div
+ className={`myTag ${selectedTemplate === 2 ? 'highlighted' : ''}`} // 条件样式
+ onClick={() => handleTemplate(2)}
+ >
+ 个人模板：化解成功结案意见范本（完整版）
+ </div>
</div>
<FormItem
label={(<div style={{ display: 'flex' }}>结案意见<div className="must">必填</div></div>)}
@@ -270,50 +293,10 @@
<TextArea
autoSize={{ minRows: 4, maxRows: 8 }}
placeholder='请填写'
- style={{ marginTop: '40px' }}
+ style={{ marginTop: '35px' }}
/>
</FormItem>
</Col>
-
- {/* <Col span={24}>
- <FormItem
- label={
- <>
- <div style={{ display: 'flex' }}>
- 结案意见
- <div className="must" style={{ marginLeft: '4px' }}>必填</div>
- </div>
- <div className='modeMore'>
- <div className='tabs1' >
- {tabs1.map((tab) => (
- <div
- key={tab.index}
- style={{
- color: selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(0,0,0,0.45)',
- border: `1px solid ${selectedTab1 === tab.index ? 'rgba(26,111,184,1)' : 'rgba(229,230,235,1)'}`,
- borderRadius: '2px',
- cursor: 'pointer',
- padding: '0px 8px',
- }}
- onClick={() => handleTabChange1(tab.index)}
- >
- {tab.label}
- </div>
- ))}
- </div>
- <div style={{ color: '#1A6FB8' }} onClick={() => setMode(!mode)}>更多模板</div>
-
- </div>
- </>
- }
- field='windupContent'
- >
- <Input.TextArea
- rows={5}
- wrapperStyle={{ width: '100%' }}
- />
- </FormItem>
- </Col> */}
</Row>
</Form>
</>
@@ -357,10 +340,22 @@
</FormItem>
</Col>
<Col span={24} style={{ position: 'relative' }}>
- <div style={{ position: 'absolute', display: 'flex ', top: '28px', zIndex: 1 }}>
- <div className='myTag' style={{ marginRight: '22px' }} onClick={() => { handleTemplate2(1) }}>公共模板：化解成功结案意见范本</div>
- <div className='myTag' onClick={() => { handleTemplate2(2) }}>个人模板：化解成功结案意见范本（完整版）</div>
+ <div style={{ position: 'absolute', display: 'flex', top: '28px', zIndex: 1 }}>
+ <div
+ className={`myTag ${selectedTemplate2 === 1 ? 'highlighted' : ''}`} // 条件样式
+ style={{ marginRight: '22px' }}
+ onClick={() => handleTemplate2(1)}
+ >
+ 公共模板：化解成功结案意见范本
+ </div>
+ <div
+ className={`myTag ${selectedTemplate2 === 2 ? 'highlighted' : ''}`} // 条件样式
+ onClick={() => handleTemplate2(2)}
+ >
+ 个人模板：化解成功结案意见范本（完整版）
+ </div>
</div>
+
<FormItem
label={(<div style={{ display: 'flex' }}>结案意见<div className="must">必填</div></div>)}
field='windupContent'
@@ -368,7 +363,7 @@
<TextArea
autoSize={{ minRows: 4, maxRows: 8 }}
placeholder='请填写'
- style={{ marginTop: '40px' }}
+ style={{ marginTop: '35px' }}
/>
</FormItem>
</Col>
@@ -469,7 +464,7 @@
<TextArea
autoSize={{ minRows: 4, maxRows: 8 }}
placeholder='请填写'
- style={{ marginTop: '40px' }}
+ style={{ marginTop: '35px' }}
/>
</FormItem>
</Col>
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>
))}
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index f4c8f52..568d4a1 100644
--- a/gz-customerSystem/src/views/register/index.jsx
+++ b/gz-customerSystem/src/views/register/index.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-09-08 15:14:12
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-10 23:36:06
+ * @LastEditTime: 2024-09-12 15:42:34
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -1346,12 +1346,12 @@
</div>
<div className='VisitWorkBench-bottom'>
群众来访接待
- <div style={{ display: 'flex', justifyContent: 'space-evenly', gap: '24px', marginTop: '16px' }}>
- <div className='bottomTab1' style={{ cursor: 'pointer' }}>
- <div className='VisitWorkBench-bottom-title' onClick={() => { navigate(`/mediate/visit`) }} style={{ color: '#206BCD' }}>大厅来访</div>
+ <div style={{ display: 'flex', justifyContent: 'space-evenly',gap:'24px',marginTop:'16px' }}>
+ <div className='bottomTab1' onClick={() => navigate(`/mediate/visit`)}>
+ <div className='VisitWorkBench-bottom-title' style={{ color: '#206BCD' }}>大厅来访</div>
{/* <img src={visitInto} alt='' className='VisitWorkBench-bottom-img' /> */}
</div>
- <div className='bottomTab2' style={{ cursor: 'pointer' }}>
+ <div className='bottomTab2'>
<div className='VisitWorkBench-bottom-title' style={{ color: '#D46B08' }}>自行排查</div>
{/* <img src={checkInto} alt='' className='VisitWorkBench-bottom-img' /> */}
</div>
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 1e933e1..f3a27e2 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -140,7 +140,7 @@
display: flex;
align-items: center;
justify-content: space-between;
- box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.25);
+ box-shadow: 0px -1px 2px 0px rgba(0, 0, 0, 0.12);
z-index: 2;
}
@@ -331,7 +331,7 @@
&-record {
border: 1px solid #D9D9D9;
- border-radius: 8px;
+ // border-radius: 8px;
margin-right: 16px;
margin-top: 8px;
@@ -340,9 +340,9 @@
display: flex;
align-items: center;
background-color: #FAFAFA;
- border-radius: 8px;
+ // border-radius: 8px 8px 0px 0px;
position: relative;
-
+
&-icon {
width: 12px;
@@ -458,6 +458,7 @@
background-color: #E8F3FF;
border-radius: 2px;
margin-top: 8px;
+ margin-bottom: -2px;
}
&-textarea {
@@ -493,6 +494,12 @@
border: 1px solid #1A6FB8;
color: #1A6FB8;
}
+}
+
+.highlighted {
+ color: #1a6fb8;
+ border: 1px solid #1a6fb8;
+ border-radius: 2px;
}
.gap {
@@ -773,10 +780,10 @@
.marginLeft {
margin-left: 55px;
- &-tip{
+ &-tip {
margin-top: -12px;
- margin-bottom: 12px;
- margin-left: 55px;
+ margin-bottom: 12px;
+ margin-left: 55px;
}
@@ -883,6 +890,7 @@
flex: 1;
padding: 12px 16px 16px 16px;
justify-content: center;
+ cursor: pointer;
}
@@ -891,7 +899,7 @@
background: linear-gradient(to right, #FFF7E6, #FFD591);
padding: 12px 16px 16px 16px;
flex: 1;
-justify-content: center;
+ justify-content: center;
}
diff --git a/gz-customerSystem/src/views/register/matterDetail/HandleRecord.jsx b/gz-customerSystem/src/views/register/matterDetail/HandleRecord.jsx
index efa06b7..8980436 100644
--- a/gz-customerSystem/src/views/register/matterDetail/HandleRecord.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/HandleRecord.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-09-06 09:40:00
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-11 12:00:20
+ * @LastEditTime: 2024-09-12 15:09:10
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\matterDetail\HandleRecord.jsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
@@ -39,7 +39,7 @@
<div>
{list?.map((record, index) => (
<div key={record.id} className='container-bottom-left-record'>
- <div className='container-bottom-left-record-top'>
+ <div className='container-bottom-left-record-top' style={{ borderBottom: record.showView ? '1px solid #d9d9d9' : null }}>
{
record.showView ? (
<img src={down} alt='' style={{ width: '18px', marginRight: '6px', cursor: 'pointer' }} onClick={() => toggleView(record.id)} />
@@ -55,15 +55,15 @@
<table border="1" cellpadding="8" className='container-bottom-left-record-bottom-table'>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">操作人</th>
- <td>{record.handleUnitName}</td>
+ <td>{record.handleUserName || '-'}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">办理意见</th>
- <td>{record.handleContent}</td>
+ <td>{record.handleContent || '-'}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">办理附件</th>
- <td>{record?.fileInfoList?.[0]?.trueName}</td>
+ <td>{record?.fileInfoList?.[0]?.trueName || '-'}</td>
</tr>
</table>
</div>
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index bac75b9..6582b3e 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -277,7 +277,11 @@
</FormItem>
</Col>
<Col span={8}>
- <FormItem label='问题属地' field='myQuesAddress'>
+ <FormItem
+ label={(<div style={{ display: 'flex' }}>问题属地<div className="must">必填</div></div>)}
+ field='myQuesAddress'
+ rules={[{ message: '请选择问题属地', required: true }]}
+ >
<Cascader
placeholder='请选择'
options={$$.locationOption()}
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 9307633..697c971 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -2,7 +2,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-10 23:47:48
+ * @LastEditTime: 2024-09-12 14:39:18
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
@@ -209,7 +209,7 @@
fileInfoList={editData.fileInfoList}
/>
<div className="dataSync-excel">
- <Space size="large" style={{ margin: '4px 14px' }}>
+ <Space size="middle" style={{ margin: '4px 14px' }}>
<Button type="primary" style={{ backgroundColor: '#1A6FB8' }} onClick={handleSave} >保存</Button>
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleReview}>{isReview ? '修改' : '预览'}</Button>
<Button type='outline' style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} onClick={handleSubmit}>提交</Button>
diff --git a/gz-customerSystem/src/views/register/visit/preview.jsx b/gz-customerSystem/src/views/register/visit/preview.jsx
index a4653b1..4d96783 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-09-04 15:00:02
+ * @LastEditTime: 2024-09-12 11:42:43
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\preview.jsx
* @Description: 预览信息
*/
@@ -201,9 +201,9 @@
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">受理时间</th>
- <td width='380'>{props.transactResult?.acceptTime || '-'}</td>
+ <td width='380'>{$$.minuteFormat(props.transactResult?.acceptTime) || '-'}</td>
<th bgcolor="#F7F8FA" className="table-title" width="120">办结时间</th>
- <td width='380'>{props.transactResult?.closeTime || '-'}</td>
+ <td width='380'>{$$.minuteFormat(props.transactResult?.closeTime) || '-'}</td>
</tr>
<tr>
<th bgcolor="#F7F8FA" className="table-title" width="120">办理意见</th>
--
Gitblit v1.8.0