From 842aae506eebb6350de6fa291e8f3e514c93d16b Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Fri, 23 Aug 2024 14:11:30 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-customerSystem/src/assets/images/icon/scan.svg | 9 +++
gz-customerSystem/src/components/MyDrawer/index.jsx | 7 +-
gz-customerSystem/src/styles/public.less | 14 +++-
gz-customerSystem/src/views/register/index.less | 16 +++++
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 75 ++++++++++++++++++++++--
gz-customerSystem/src/api/appUrl.js | 10 +-
gz-customerSystem/src/views/register/visit/index.jsx | 24 ++++++--
gz-customerSystem/src/assets/images/icon/index.js | 9 ++
8 files changed, 137 insertions(+), 27 deletions(-)
diff --git a/gz-customerSystem/src/api/appUrl.js b/gz-customerSystem/src/api/appUrl.js
index 52282b8..12839b7 100644
--- a/gz-customerSystem/src/api/appUrl.js
+++ b/gz-customerSystem/src/api/appUrl.js
@@ -2,20 +2,20 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:25:57
- * @LastEditTime: 2024-08-22 14:10:51
+ * @LastEditTime: 2024-08-23 09:35:11
* @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: api地址
*/
export const debug = {
// web服务
- // baseUrl: 'http://gz.hugeinfo.com.cn',
- baseUrl: 'http://192.168.3.108:9002',
+ baseUrl: 'http://gz.hugeinfo.com.cn',
+ // baseUrl: 'http://192.168.3.108:9002',
// baseUrl: 'http://mdqgnh.natappfree.cc',
// 附件服务
- fileUrl: 'http://192.168.3.108:9002',
- // fileUrl: 'http://gz.hugeinfo.com.cn',
+ // fileUrl: 'http://192.168.3.108:9002',
+ fileUrl: 'http://gz.hugeinfo.com.cn',
// 文件查看url 后面接附件编号
diff --git a/gz-customerSystem/src/assets/images/icon/index.js b/gz-customerSystem/src/assets/images/icon/index.js
index 529bec5..8e9d79e 100644
--- a/gz-customerSystem/src/assets/images/icon/index.js
+++ b/gz-customerSystem/src/assets/images/icon/index.js
@@ -2,8 +2,8 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-03-21 11:34:36
- * @LastEditTime: 2023-06-27 14:31:36
- * @LastEditors: lihl
+ * @LastEditTime: 2024-08-22 19:32:26
+ * @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: icon
*/
@@ -137,8 +137,12 @@
import registerChooseModal_3 from './registerChooseModal_3.svg';
import registerChooseModal_4 from './registerChooseModal_4.svg';
+
// 调解邀请码
import qrCodeImg from './qrCode.svg';
+
+//大厅来访
+import scan from './scan.svg'
export {
mediationCenter,
@@ -263,4 +267,5 @@
registerChooseModal_3,
registerChooseModal_4,
qrCodeImg,
+ scan
};
diff --git a/gz-customerSystem/src/assets/images/icon/scan.svg b/gz-customerSystem/src/assets/images/icon/scan.svg
new file mode 100644
index 0000000..b4f37ef
--- /dev/null
+++ b/gz-customerSystem/src/assets/images/icon/scan.svg
@@ -0,0 +1,9 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.66667 1.75H2.33333C2.01117 1.75 1.75 2.01117 1.75 2.33333V4.66667" stroke="#1A6FB8" stroke-width="0.875" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.66667 12.25H2.33333C2.01117 12.25 1.75 11.9888 1.75 11.6667V9.33334" stroke="#1A6FB8" stroke-width="0.875" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.33337 12.25H11.6667C11.9889 12.25 12.25 11.9888 12.25 11.6667V9.33334" stroke="#1A6FB8" stroke-width="0.875" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.33337 1.75H11.6667C11.9889 1.75 12.25 2.01117 12.25 2.33333V4.66667" stroke="#1A6FB8" stroke-width="0.875" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M9.91671 7H4.08337" stroke="#1A6FB8" stroke-width="0.875" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.875 4.66666H6.125" stroke="#1A6FB8" stroke-width="0.875" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M7.875 9.33334H6.125" stroke="#1A6FB8" stroke-width="0.875" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/gz-customerSystem/src/components/MyDrawer/index.jsx b/gz-customerSystem/src/components/MyDrawer/index.jsx
index 50acf2c..96cdaaa 100644
--- a/gz-customerSystem/src/components/MyDrawer/index.jsx
+++ b/gz-customerSystem/src/components/MyDrawer/index.jsx
@@ -2,8 +2,8 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-06-22 11:14:43
- * @LastEditTime: 2022-10-28 11:07:04
- * @LastEditors: ldh
+ * @LastEditTime: 2024-08-22 20:14:57
+ * @LastEditors: dminyi 1301963064@qq.com
* @Version: 1.0.0
* @Description: 我的抽屉组件
*/
@@ -25,6 +25,7 @@
mainStyle = {},
zIndex = 1000,
container = false,
+ titleBefore=false
}) => {
return (
<Drawer
@@ -42,7 +43,7 @@
>
<div className="myDrawer" style={bodyStyle}>
<div className="myDrawer-header">
- <div className="myDrawer-header-title">{title}</div>
+ <div className={!titleBefore ? 'myDrawer-header-title' : ''}>{title}</div>
<CloseOutlined className="myDrawer-header-close" onClick={onClose} />
</div>
<div className="myDrawer-main" style={mainStyle}>
diff --git a/gz-customerSystem/src/styles/public.less b/gz-customerSystem/src/styles/public.less
index c9929ba..03efcd4 100644
--- a/gz-customerSystem/src/styles/public.less
+++ b/gz-customerSystem/src/styles/public.less
@@ -809,10 +809,18 @@
.dialogBack {}
}
+// .arco-btn-primary:not(.arco-btn-disabled) {
+// background-color: @main-color;
+
+// &:hover {
+// background-color: @main-color;
+// }
+// }
+
.arco-btn-primary:not(.arco-btn-disabled) {
background-color: @main-color;
+}
- &:hover {
- background-color: @main-color;
- }
+.arco-btn-primary:not(.arco-btn-disabled):not(.arco-btn-loading):hover {
+ background-color: @main-color;
}
\ No newline at end of file
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index e414e46..639b843 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -182,4 +182,18 @@
color: #1d2129;
line-height: 24px;
margin-bottom: 20px;
-}
\ No newline at end of file
+}
+
+// .arco-steps-item-process .arco-steps-icon{
+// background-color: #1A6FB8;
+// }
+
+// .arco-steps-mode-navigation .arco-steps-item-active::after{
+// background-color: #1A6FB8;
+
+// }
+
+// .arco-radio-checked .arco-radio-mask {
+// background-color: #1A6FB8;
+// border-color: #1A6FB8;
+// }
\ No newline at end of file
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index fb4bb25..75e5910 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -22,6 +22,8 @@
import NewFileCheck from '../../../filesCheck/newFileCheck';
import { IconLink } from '@arco-design/web-react/icon';
import MapView from './map'
+import { scan } from '../../../../assets/images/icon'
+import MyDrawer from '../../../../components/MyDrawer';
const RadioGroup = Radio.Group;// 根据调解案号获取纠纷登记信息
const FormItem = Form.Item;
@@ -46,8 +48,8 @@
const [detailVisabled, setDetailVisabled] = useState(false);//查看信息弹窗控制
const [mapView, setMapView] = useState(false);
const [flagId, setFlagId] = useState(0);//赋予当事人唯一id，用于删除
- const formRef = useRef();
-
+ const [visible, setVisible] = useState(false);
+ const [apply, setApply] = useState(false);
const addressOptions = [
{ label: '地址1', value: 'address1' },
@@ -247,7 +249,7 @@
},
{
- title: '上传时间',
+ title: '最新上传时间',
dataIndex: 'mediateUserName',
key: 'mediateUserName',
width: 180,
@@ -517,10 +519,11 @@
<FormItem
label={<div style={{ display: 'flex' }}>
事项概况
- <Tooltip title='1111'>
+ <Tooltip onClick={() => setVisible(true)}>
<img src={question1} alt="" style={{ width: '13px', height: '13px', marginTop: '4px', marginLeft: '4px' }} />
</Tooltip>
<div className="must">必填</div>
+ <img src={scan} alt="" style={{ marginRight: '-2px', marginLeft: '8px' }} />
<div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => setScanFile(true)}>识别上传材料</div>
</div>
}
@@ -531,7 +534,7 @@
maxLength={2000}
showWordLimit
rows={5}
- placeholder='请填写问题发生的起因、过程和结果'
+ placeholder='请完整描述事项概况，应具备5要素：发生时间+发生地点+人物情况+事项起因+事项经过'
wrapperStyle={{ width: '100%' }}
/>
</FormItem>
@@ -540,10 +543,11 @@
<FormItem
label={<div style={{ display: 'flex' }}>
申请请求
- <Tooltip title='1111'>
+ <Tooltip onClick={() => setApply(true)}>
<img src={question1} alt="" style={{ width: '13px', height: '13px', marginTop: '4px', marginLeft: '4px' }} />
</Tooltip>
<div className="must">必填</div>
+ <img src={scan} alt="" style={{ marginRight: '-2px', marginLeft: '8px' }} />
<div style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => setScanFile(true)}>识别上传材料</div>
</div>
}
@@ -569,7 +573,7 @@
labelCol={{ span: 11 }}
wrapperCol={{ span: 13 }}
>
- <RadioGroup options={['否', '是']} />
+ <RadioGroup options={['否', '是']} />
</FormItem>
</div>
</Row>
@@ -768,6 +772,63 @@
>
<MapView />
</Modal>
+ <MyDrawer
+ title='事项概况指南'
+ visible={visible}
+ width={1000}
+ style={{ position: 'absolute' }}
+ onClose={() => setVisible(false)}
+ titleBefore={true}
+ >
+ <div style={{ marginTop: '-8px' }}>
+ 事项简述应该填写完整，完整的事项简述应具备5要素：发生时间+发生地点+人物情况+事项起因+事项经过。<br />
+ 例如：<br />
+ 2024年8月13日，张某与女性好友王某在某烧烤档就餐期间发生场盾争执，报警人称女方从今年一月份开始，以各种理由让其帮忙付了外卖费，送金链等首饰，但又不确认关系，女方后期还拉黑了报警人，因此报警人认为女方涉嫌诈骗。
+ </div>
+ </MyDrawer>
+ <MyDrawer
+ title='事件等级指南'
+ visible={apply}
+ width={1000}
+ style={{ position: 'absolute' }}
+ onClose={() => setApply(false)}
+ titleBefore={true}
+ >
+ <div style={{ marginTop: '-8px' }}>
+ <div>
+ <div style={{ color: '#1A6FB8', fontSize: '15px',lineHeight:'23px',marginBottom:'8px' }}>一类重点事件</div>
+ 1、5人（含5人）以上到非接待场所聚集、滞留、静坐、游行或准备上访；<br />
+ 2、拉横幅、穿着“状衣”、呼喊口号、呼喊标语、堵塞交通非法占据公其场所、扰乱公共秩序、向他人散发传单等上访材料；<br />
+ 3、拖欠工资、劳资纠纷涉及人数5人以上；<br />
+ 4、拖欠工资总全额5万元以上，经济合同外涉金额20万元以上；<br />
+ 5、扬言到市赴省进京越级上访；
+ 6、存在轻生、自残等危险行为，打砸公私财物等极端倾向；<br />
+ 7、群体性民事纠纷（5人及5人以上的邻里矛盾纠纷、经济债务纠纷、家庭纠纷等可能导致“民转刑”的民事纠纷）；8、存在重大安全隐患、重大不稳定因索的矛盾；9、涉及政治类，非宗教类的非访宣传（在出租屋内从事涉邪教迷信印刷、存放资料的；在公共场所粘贴类似邪教的符号、图案、标志等）10、县（市、区）职能部门、各镇（街道）分管领导根据应急情况认为有必要启动红色预警机制的其他矛盾纠纷。
+ </div>
+ <div>
+ <div style={{ color: '#1A6FB8', fontSize: '15px',lineHeight:'23px',marginBottom:'8px',marginTop:'20px' }}>二类重点事件</div>
+ 1、5人（含5人）以上到非接待场所聚集、滞留、静坐、游行或准备上访；<br />
+ 2、拉横幅、穿着“状衣”、呼喊口号、呼喊标语、堵塞交通非法占据公其场所、扰乱公共秩序、向他人散发传单等上访材料；<br />
+ 3、拖欠工资、劳资纠纷涉及人数5人以上；<br />
+ 4、拖欠工资总全额5万元以上，经济合同外涉金额20万元以上；<br />
+ 5、扬言到市赴省进京越级上访；
+ 6、存在轻生、自残等危险行为，打砸公私财物等极端倾向；<br />
+ 7、群体性民事纠纷（5人及5人以上的邻里矛盾纠纷、经济债务纠纷、家庭纠纷等可能导致“民转刑”的民事纠纷）；8、存在重大安全隐患、重大不稳定因索的矛盾；9、涉及政治类，非宗教类的非访宣传（在出租屋内从事涉邪教迷信印刷、存放资料的；在公共场所粘贴类似邪教的符号、图案、标志等）10、县（市、区）职能部门、各镇（街道）分管领导根据应急情况认为有必要启动红色预警机制的其他矛盾纠纷。
+ </div>
+ <div>
+ <div style={{ color: '#1A6FB8', fontSize: '15px',lineHeight:'23px',marginBottom:'8px',marginTop:'20px' }}>三类普通事件</div>
+ 1、5人（含5人）以上到非接待场所聚集、滞留、静坐、游行或准备上访；<br />
+ 2、拉横幅、穿着“状衣”、呼喊口号、呼喊标语、堵塞交通非法占据公其场所、扰乱公共秩序、向他人散发传单等上访材料；<br />
+ 3、拖欠工资、劳资纠纷涉及人数5人以上；<br />
+ 4、拖欠工资总全额5万元以上，经济合同外涉金额20万元以上；<br />
+ 5、扬言到市赴省进京越级上访；
+ 6、存在轻生、自残等危险行为，打砸公私财物等极端倾向；<br />
+ 7、群体性民事纠纷（5人及5人以上的邻里矛盾纠纷、经济债务纠纷、家庭纠纷等可能导致“民转刑”的民事纠纷）；8、存在重大安全隐患、重大不稳定因索的矛盾；9、涉及政治类，非宗教类的非访宣传（在出租屋内从事涉邪教迷信印刷、存放资料的；在公共场所粘贴类似邪教的符号、图案、标志等）10、县（市、区）职能部门、各镇（街道）分管领导根据应急情况认为有必要启动红色预警机制的其他矛盾纠纷。
+ </div>
+
+ </div>
+ </MyDrawer>
+
</div>
)
}
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 1a001b1..fe370ed 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-08-21 16:57:16
+ * @LastEditTime: 2024-08-23 10:12:47
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
@@ -14,11 +14,11 @@
import "@arco-themes/react-gzzz/css/arco.css";
import '../index.less';
import { Space } from 'antd';
-import { Button } from '@arco-design/web-react';
+import { Button, Steps } from '@arco-design/web-react';
import VisitorRegister from './component/visitorRegister';
import Preview from './preview';
-
+const Step = Steps.Step;
function getCaseDataApi(submitData) {
return $$.ax.request({ url: `caseInfo/getCaseInfo?id=${submitData}`, type: 'get', service: 'mediate' });
@@ -29,8 +29,8 @@
const Organization = () => {
const formRef = useRef();
- const [tabsActive, setTabsActive] = useState('1');// tabs当前选择的标签信息
const [isReview, setIsReview] = useState(false);//预览页面控制
+ const [current, setCurrent] = useState(1);
const tabs = [
{ label: '事件登记', key: '1' },
@@ -80,6 +80,7 @@
function submit() {
$$.info({ type: 'warning', content: '您没有预约记录，暂时无法提交' })
}
+ console.log(current,'current')
return (
@@ -89,8 +90,19 @@
{ breadcrumbData: [{ title: '工作台' }, { title: '来访登记' }], title: '来访登记' }
}
>
- <RegisterTab tabs={tabs} activeKey={tabsActive} onChange={(activeKey) => setTabsActive(activeKey)} style={{ background: '#fff' }} />
- {tabsActive === '1' &&
+ {/* <RegisterTab tabs={tabs} activeKey={tabsActive} onChange={(activeKey) => setTabsActive(activeKey)} style={{ background: '#fff' }} /> */}
+ <div style={{backgroundColor: '#fff',margin:'12px 16px 0px 16px',paddingTop:'16px',paddingLeft:'91px'}}>
+ <Steps type='navigation' current={current} onChange={setCurrent} style={{ }}>
+ <Step title='来访登记' style={{ color: '#1A6FB8' }} disabled/>
+ <Step title='事件流转' disabled/>
+ <Step title='办理反馈' disabled/>
+ <Step title='结案审核' disabled/>
+ <Step title='当事人评价' disabled/>
+ <Step title='结案归档' disabled/>
+ </Steps>
+
+ </div>
+ {current === 1 &&
<Fragment>
{isReview ? <Preview /> : <VisitorRegister formRef={formRef} />}
<div className="dataSync-excel">
--
Gitblit v1.8.0