From 7938180736be7e610ef1f27e03b2d3e1b753fe2e Mon Sep 17 00:00:00 2001
From: zhangyongtian <1181606322@qq.com>
Date: Wed, 11 Sep 2024 10:01:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.79.193.119:9090/r/gzzfw/frontEnd/gzDyh
---
gz-wxparty/pages/AIAideDetail/index.js | 6
gz-wxparty/pages/ssimList/index.wxss | 5
gz-wxparty/pages/ssimList/index.wxml | 6
gz-wxparty/pages/organizeList/index.wxss | 5
gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx | 1
gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx | 4
gz-customerSystem/src/views/register/index.jsx | 25 +-
gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx | 20 +
gz-wxparty/pages/organizeList/index.wxml | 6
gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx | 7
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 8
gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx | 53 ++--
by-wxparty/utils/util.js | 2
gz-wxparty/pages/addPerson/index.js | 4
gz-customerSystem/src/views/register/closingReview/index.jsx | 20 +
gz-customerSystem/src/views/register/handleFeedback/index.jsx | 33 ++
gz-customerSystem/public/locationSelect.js | 2
gz-wxparty/pages/homePage/index.wxml | 64 +++++-
gz-wxparty/pages/homePage/index.wxss | 75 +++++++
gz-wxparty/pages/myRegisterList/index.wxss | 13 +
gz-wxparty/pages/register/index.js | 29 ++
gz-wxparty/api/api.js | 2
gz-customerSystem/src/api/appUrl.js | 40 ++--
gz-wxparty/pages/homePage/index.js | 30 ++
gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx | 6
gz-wxparty/pages/AIAide/index.json | 2
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 11
gz-customerSystem/src/views/register/matterDetail/FileTable.jsx | 12
gz-customerSystem/src/views/register/visit/index.jsx | 31 +-
gz-wxparty/pages/myRegisterList/index.wxml | 28 ++
gz-customerSystem/src/views/register/matterDetail/index.less | 3
gz-wxparty/pages/AIAideDetail/index.wxml | 17 +
gz-wxparty/pages/myRegisterList/index.js | 30 ++
33 files changed, 458 insertions(+), 142 deletions(-)
diff --git a/by-wxparty/utils/util.js b/by-wxparty/utils/util.js
index ff41e3d..8658a7f 100644
--- a/by-wxparty/utils/util.js
+++ b/by-wxparty/utils/util.js
@@ -5,7 +5,7 @@
const url = api.url;
// 是否是开发环境
-const isDebug = true;
+const isDebug = false;
const baseUrl = isDebug ? api.url.debug : api.url.web;
diff --git a/gz-customerSystem/public/locationSelect.js b/gz-customerSystem/public/locationSelect.js
index c15064d..ee362e3 100644
--- a/gz-customerSystem/public/locationSelect.js
+++ b/gz-customerSystem/public/locationSelect.js
@@ -1,7 +1,7 @@
let locationSelect = {
'19': [
{
- 'label': '广东',
+ 'label': '广东省',
'value': '19',
'parentId': 'root',
'children': [
diff --git a/gz-customerSystem/src/api/appUrl.js b/gz-customerSystem/src/api/appUrl.js
index 6bfac1c..2478b6c 100644
--- a/gz-customerSystem/src/api/appUrl.js
+++ b/gz-customerSystem/src/api/appUrl.js
@@ -2,7 +2,7 @@
* @Company: hugeInfo
* @Author: ldh
* @Date: 2022-02-16 11:25:57
- * @LastEditTime: 2024-09-10 10:36:24
+ * @LastEditTime: 2024-09-10 16:55:40
* @LastEditors: lwh
* @Version: 1.0.0
* @Description: api地址
@@ -26,23 +26,23 @@
// 签章的文档编辑链接
fileDocx2: "/InsertSeal/Word/AddSeal1/Word1",
- // 不同服务接口type
- mediate: "dyh-mediate", // dyh-mediate
- cust: "dyh-cust", // dyh-cust
- oper: "dyh-oper", // dyh-oper
- sys: "dyh-sys", // dyh-sys
- disp: "dyh-disp", //dyh-disp
- utils: "dyh-utils",
+ // 不同服务接口type
+ mediate: 'dyh-mediate', // dyh-mediate
+ cust: 'dyh-cust', // dyh-cust
+ oper: 'dyh-oper', // dyh-oper
+ sys: 'dyh-sys', // dyh-sys
+ disp: 'dyh-disp', //dyh-disp
+ utils: 'dyh-utils',
};
// 正式版
export const web = {
- // web服务
- baseUrl: "https://zfw-dyh.by.gov.cn",
- // baseUrl: 'http://146.4.99.61:8088/byzfw',
+ // web服务
+ baseUrl: 'https://zfw-dyh.by.gov.cn',
+ // baseUrl: 'http://146.4.99.61:8088/byzfw',
- // 附件服务
- fileUrl: "https://zfw-dyh.by.gov.cn",
+ // 附件服务
+ fileUrl: 'https://zfw-dyh.by.gov.cn',
// 文件查看url 后面接附件编号
fileShowUrl: '/dyh-sys/api/v1/fileInfo/show/',
@@ -53,11 +53,11 @@
// 签章的文档编辑链接
fileDocx2: '/InsertSeal/Word/AddSeal1/Word1',
- // 不同服务接口type
- mediate: "gzdyh-mediate", // dyh-mediate
- cust: "gzdyh-cust", // dyh-cust
- oper: "gzdyh-oper", // dyh-oper
- sys: "gzdyh-sys", // dyh-sys
- disp: "gzdyh-disp", //dyh-disp
- utils: "gzdyh-utils",
+ // 不同服务接口type
+ mediate: 'gzdyh-mediate', // dyh-mediate
+ cust: 'gzdyh-cust', // dyh-cust
+ oper: 'gzdyh-oper', // dyh-oper
+ sys: 'gzdyh-sys', // dyh-sys
+ disp: 'gzdyh-disp', //dyh-disp
+ utils: 'gzdyh-utils',
};
diff --git a/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx b/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
index 8a2b746..14fee11 100644
--- a/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
+++ b/gz-customerSystem/src/views/register/closingReview/component/ReviewExamine.jsx
@@ -58,7 +58,7 @@
value: '4'
},
]
-
+ console.log(props.id,'props.idprops.id')
useEffect(() => {
getInfoData()
getAppId()
@@ -97,7 +97,7 @@
if (!errors) {
const { file, myNoUp, ...rest } = formRef.current.getFields()
requestSubmit({
- id,
+ id: props.id,
caseId: props.caseId,
caseTaskId: props.caseTaskId,
...rest
@@ -111,7 +111,8 @@
const res = await submit(data)
if (res.type) {
$$.infoSuccess({ content: '提交成功！' });
- navigate(`/mediate/visit/visitWorkBench`) }
+ navigate(`/mediate/visit/visitWorkBench`)
+ }
}
//删除文件
diff --git a/gz-customerSystem/src/views/register/closingReview/index.jsx b/gz-customerSystem/src/views/register/closingReview/index.jsx
index a9dfa4f..a4c2a37 100644
--- a/gz-customerSystem/src/views/register/closingReview/index.jsx
+++ b/gz-customerSystem/src/views/register/closingReview/index.jsx
@@ -16,6 +16,10 @@
return $$.ax.request({ url: `caseTask/getTabButton?caseTaskId=${caseTaskId}`, type: 'get', service: 'mediate' });
}
+function getCaseInfoApi(id) {
+ return $$.ax.request({ url: '/caseInfo/getCaseInfo?id=' + id, type: 'get', service: 'mediate' });
+}
+
const myTab = [
{
img: Matter,
@@ -36,13 +40,17 @@
const ClosingReview = () => {
const caseId = $$.getQueryString('caseId')
const caseTaskId = $$.getQueryString('caseTaskId')
+ const windupId = $$.getQueryString('windupId')
+
const routeData = useParams();
const [authorData, setAuthorData] = useState({});
const [tabsList, setTabsList] = useState([]);
const [tabsActive, setTabsActive] = useState();
+ const [newId, setNewId] = useState(caseId)
useEffect(() => {
- getAuthor()
+ getAuthor();
+ getCaseInfo()
console.log(caseId,caseTaskId,'caseId','caseTaskId')
}, [])
@@ -68,6 +76,14 @@
}
}
+ const getCaseInfo = async (id) => {
+ const res = await getCaseInfoApi(caseId)
+ if(res.type){
+ console.log(res.data?.id,'res.data?.idres.data?.id')
+ setNewId(res.data?.id)
+ }
+ }
+
//根据id定义组件
const getTypeDom = (key) => {
if (key === 'dslxq' || key === 'sxxq') {
@@ -77,7 +93,7 @@
return <ApplyInfo />
}
if (key === 'jash') {
- return <ReviewExamine caseTaskId={caseTaskId} caseId={caseId} />
+ return <ReviewExamine caseTaskId={caseTaskId} caseId={caseId} id={windupId} />
}
}
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx b/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
index c6e8e7a..3c4585c 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/AssignedModel.jsx
@@ -6,6 +6,8 @@
import SelectObjModal from '@/components/SelectObjModal/selectPerson';
import { useParams } from 'react-router-dom';
import * as $$ from '@/utils/utility';
+import { useNavigate } from 'react-router-dom';
+
const FormItem = Form.Item;
const TextArea = Input.TextArea;
@@ -21,6 +23,7 @@
export default function BackModel(props) {
const routeData = useParams();
+ const navigate = useNavigate();
const formRef = useRef();
const [isModalVisible, setIsModalVisible] = useState(false);
const [wantUser, setWantUser] = useState({});
@@ -63,7 +66,8 @@
const res = await assign({ ...data, caseTaskId: props.caseTaskId })
if (res.type) {
$$.infoSuccess({ content: '交办成功！' });
- props.onCancel()
+ props.onCancel();
+ navigate('/mediate/visit/visitWorkBench')
}
}
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index 807b3da..777573e 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
@@ -38,6 +38,7 @@
})
if (res.type) {
$$.infoSuccess({ content: '受理成功！' });
+ navigate('/mediate/visit/visitWorkBench')
}
},
});
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
index f52769e..cc9155e 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
@@ -2,11 +2,12 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-09-02 14:49:13
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-10 15:46:08
+ * @LastEditTime: 2024-09-10 19:16:46
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\handleFeedback\component\CaseResult.jsx
* @Description: 结案申请
*/
import React, { useState, useRef } from 'react';
+import { useNavigate } from 'react-router-dom';
import { Modal, Form, Select, Upload, Input } from '@arco-design/web-react';
import { Col, Space, Button, Tooltip, Radio, Row } from 'antd';
import DocumentScanner from '../../matterDetail/FileUpLoad'
@@ -18,6 +19,7 @@
import * as $$ from '@/utils/utility';
const appUrl = $$.appUrl;
+
const FormItem = Form.Item;
function windupApplyApi(data) {
@@ -28,6 +30,7 @@
const CaseResult = ({ visible = false, handleOnCancel, caseResultId, caseId, caseTaskId }) => {
const formRef = useRef();
+ const navigate = useNavigate();
const formRefWrite = useRef();
const failRef = useRef();
const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab
@@ -113,24 +116,29 @@
console.log(
{
mediResultName: selectedTab === '1' ? '化解成功' : '化解不成功',
- agreeType: value === 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'
+ }, 'windupApplyData'
)
const res = await windupApplyApi({
mediResultName: selectedTab === '1' ? '化解成功' : '化解不成功',
- agreeType: value === 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
- })
+ })
if (res.type) {
$$.infoSuccess({ content: '提交成功' });
- handleOnCancel()
+ handleOnCancel();
+ navigate('/mediate/visit/visitWorkBench')
}
}
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 3db9acb..93ee1b7 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -189,7 +189,7 @@
}
const getByIdRole = async () => {
- const res = await getByIdRoleApi('2105180249501982')
+ const res = await getByIdRoleApi(caseId)
setPersonData(res.data)
}
@@ -215,7 +215,8 @@
})
if (res.type) {
$$.infoSuccess({ content: '修改成功' });
- listFeedback(caseId)
+ listFeedback(caseId);
+ formRef.current.resetFields();
}
} else {
const res = await saveFeedbackApi({
@@ -226,7 +227,8 @@
})
if (res.type) {
$$.infoSuccess({ content: '保存成功' });
- listFeedback(caseId)
+ listFeedback(caseId);
+ formRef.current.resetFields();
}
}
}
diff --git a/gz-customerSystem/src/views/register/handleFeedback/index.jsx b/gz-customerSystem/src/views/register/handleFeedback/index.jsx
index 99f4559..b04ba49 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/index.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/index.jsx
@@ -3,7 +3,7 @@
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
* @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-10 16:22:30
+ * @LastEditTime: 2024-09-10 19:11:33
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*
@@ -44,6 +44,10 @@
return $$.ax.request({ url: `caseTask/getTabButton?caseTaskId=` + caseTaskId, type: 'get', service: 'mediate' });
}
+function getCaseInfoApi(id) {
+ return $$.ax.request({ url: '/caseInfo/getCaseInfo?id=' + id, type: 'get', service: 'mediate' });
+}
+
const Organization = () => {
@@ -54,7 +58,8 @@
const [tabsActive, setTabsActive] = useState('sxxq');
const [AiQuestionView, setAiQuestionView] = useState(false)
const [aiData, setAiData] = useState([])
- const [aiLawData, setAiLawData] = useState([])
+ const [aiLawData, setAiLawData] = useState([]);
+ const [caseDetailAi, setCaseDetailAi] = useState({});
const [caseDetailView, setCaseDetail] = useState({})
const [authorData, setAuthorData] = useState({});
const [disTab, setDisTab] = useState(true);
@@ -84,9 +89,9 @@
const getCase = async () => {
const res = await getCaseApi({
- caseDes: '牛某某诉称：其在上海某物流有限公司（以下简称物流公司）担任叉车工。某日上班与领导的车辆碰擦，对方全责，领导要求私了，因其未同意而被物流公司开除。物流公司解除劳动合同违法，应当支付赔偿金。物流公司辩称：物流公司要求劳动者“健康”，牛某某持有残疾证，影响其从事叉车工作。牛某某入职前故意隐瞒身体残疾的情况，有违诚信，入职后以此为由索要优待未果，辱骂领导。物流公司并非因牛某某身体残疾而解除，而是因其隐瞒持有残疾证及威胁领导，解除劳动合同合法。法院经审理查明，牛某某左手大拇指部分缺失，其于2019年10月10日到物流公司工作，担任叉车工。牛某某入职时提交了在有效期内的叉车证，并参加了入职体检，体检合格。物流公司要求填写员工登记表，登记表上列明有无大病病史、家族病史、工伤史、传染病史，并列了“其他”栏。牛某某均勾选了“无”。牛某某正常完成了工作。2020年7月4日，物流公司以牛某某隐瞒持有残疾证，且威胁领导恐吓上级，属于严重违纪为由解除劳动合同。2020年7月10日，牛某某向上海市浦东新区劳动人事争议仲裁委员会申请仲裁，要求物流公司支付违法解除劳动合同赔偿金30,000元。审理中牛某某表示，其可以正常工作，并不要求物流公司额外支付残疾人的福利待遇，所以没有告知物流公司其身有残疾。2020年10月13日，该仲裁委员会按牛某某工资2,930元为标准裁决物流公司支付牛某某违法解除劳动合同赔偿金5,860元。',
- caseClaim: '牛某某向一审法院起诉请求物流公司支付其违法解除劳动合同赔偿金30,000元。',
- caseId: '10086'
+ caseDes: caseDetailAi?.caseDes,
+ caseClaim: caseDetailAi?.caseClaim,
+ caseId: caseId
})
console.log(res.data, 'res')
if (res.type) {
@@ -96,9 +101,9 @@
const getLaw = async () => {
const res = await getLawApi({
- caseDes: '牛某某诉称：其在上海某物流有限公司（以下简称物流公司）担任叉车工。某日上班与领导的车辆碰擦，对方全责，领导要求私了，因其未同意而被物流公司开除。物流公司解除劳动合同违法，应当支付赔偿金。物流公司辩称：物流公司要求劳动者“健康”，牛某某持有残疾证，影响其从事叉车工作。牛某某入职前故意隐瞒身体残疾的情况，有违诚信，入职后以此为由索要优待未果，辱骂领导。物流公司并非因牛某某身体残疾而解除，而是因其隐瞒持有残疾证及威胁领导，解除劳动合同合法。法院经审理查明，牛某某左手大拇指部分缺失，其于2019年10月10日到物流公司工作，担任叉车工。牛某某入职时提交了在有效期内的叉车证，并参加了入职体检，体检合格。物流公司要求填写员工登记表，登记表上列明有无大病病史、家族病史、工伤史、传染病史，并列了“其他”栏。牛某某均勾选了“无”。牛某某正常完成了工作。2020年7月4日，物流公司以牛某某隐瞒持有残疾证，且威胁领导恐吓上级，属于严重违纪为由解除劳动合同。2020年7月10日，牛某某向上海市浦东新区劳动人事争议仲裁委员会申请仲裁，要求物流公司支付违法解除劳动合同赔偿金30,000元。审理中牛某某表示，其可以正常工作，并不要求物流公司额外支付残疾人的福利待遇，所以没有告知物流公司其身有残疾。2020年10月13日，该仲裁委员会按牛某某工资2,930元为标准裁决物流公司支付牛某某违法解除劳动合同赔偿金5,860元。',
- caseClaim: '牛某某向一审法院起诉请求物流公司支付其违法解除劳动合同赔偿金30,000元。',
- caseId: '10086'
+ caseDes: caseDetailAi?.caseDes,
+ caseClaim: caseDetailAi?.caseClaim,
+ caseId: caseId
})
if (res.type) {
setAiLawData(res.data)
@@ -131,10 +136,22 @@
}
}
+ const getCaseInfo = async (id) => {
+ const res = await getCaseInfoApi(id)
+ if (res.type) {
+ console.log(res, 'res')
+ let caseDes = res.data.caseDes;
+ let caseClaim = res.data.caseClaim;
+ setCaseDetailAi({ caseDes: caseDes, caseClaim: caseClaim })
+
+ }
+ }
+
useEffect(() => {
+ getCaseInfo(caseId)
getAuthor();
getCase();
getLaw();
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index c6bd0be..78a9971 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 16:54:28
+ * @LastEditTime: 2024-09-10 20:29:15
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -395,7 +395,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '分派时限',
@@ -452,7 +451,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '分派时限',
@@ -498,7 +496,7 @@
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
- </Space>
+ </Space>
),
},
];
@@ -508,7 +506,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '签收时限',
@@ -554,7 +551,7 @@
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
- <div onClick={() => handleSign(record.caseId, record.ownerId)}>签收</div>
+ <div onClick={() => handleSign(record.caseId, record.ownerId)} style={{ cursor: 'pointer' }}>签收</div>
</Space>
),
},
@@ -565,7 +562,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '签收时限',
@@ -797,7 +793,7 @@
width: 180,
render: (text, record) => (
<Space>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer',color: '#1A6FB8' }}>详情</div>
<div onClick={() => navigate(`/mediate/visit/handleFeedback?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer', color: '#1A6FB8' }}>处理</div>
</Space>
),
@@ -880,7 +876,6 @@
dataIndex: 'turnaroundTime',
key: 'turnaroundTime',
width: 100,
- render: (text, record, index) => <span>{index + 1}</span>,
},
{
title: '回复时限',
@@ -1008,7 +1003,7 @@
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
- <div onClick={() => navigate(`/mediate/visit/closingReview?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>处理</div>
+ <div onClick={() => navigate(`/mediate/visit/closingReview?caseTaskId=${record.ownerId}&caseId=${record.caseId}&windupId=${record.windupId}`)} style={{ cursor: 'pointer' }}>处理</div>
</Space>
),
},
@@ -1017,7 +1012,9 @@
const sign = async (caseId, ownerId) => {
const res = await signApi({ caseId: caseId, caseTaskId: ownerId })
if (res.type) {
- $$.infoSuccess('签收成功')
+ $$.infoSuccess({ content: '签收成功' });
+ getCountList();
+ pageMyTaskFpNew()
}
}
@@ -1085,7 +1082,7 @@
}
if (tabActivekey === '4') {
setColumnType(caseResultApply)
- pageMyTaskBl('1')
+ pageMyTaskBl('0')
}
}
if (type === '1') {
@@ -1097,7 +1094,7 @@
if (type === '3') {
if (tabActivekey === '4') {
setColumnType(backColumn)
- pageMyTaskBl('2')
+ pageMyTaskBl('1')
}
}
@@ -1291,7 +1288,7 @@
自行排查
<div style={{ display: 'flex', justifyContent: 'space-evenly' }}>
<div className='bottomTab1'>
- <div className='VisitWorkBench-bottom-title' onClick={() => navigate(`/mediate/visit`)} style={{ color: '#206BCD' }}>大厅来访</div>
+ <div className='VisitWorkBench-bottom-title' onClick={() => navigate(`/mediate/visit`)} style={{ color: '#206BCD',cursor:'pointer' }}>大厅来访</div>
<img src={visitInto} alt='' className='VisitWorkBench-bottom-img' />
</div>
<div className='bottomTab2'>
diff --git a/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx b/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
index 981d034..db2c5b9 100644
--- a/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/FileTable.jsx
@@ -234,8 +234,6 @@
}
}),
}
- } else {
- return item
}
})
//回传文件数据的时候使用
@@ -248,6 +246,7 @@
//根据sourceType生成组件
const formType = (type) => {
+
if (type === '22_00018-101') {
//申请材料
return (
@@ -271,9 +270,10 @@
return item
}
})
+
setFileMap({
...fileMap,
- '22_00018-101': newList
+ '22_00018-101': newList.filter(i => i.ownerType === '22_00018-101')
})
}}
/>
@@ -307,7 +307,7 @@
})
setFileMap({
...fileMap,
- '22_00018-102': newList
+ '22_00018-102': newList.filter(i => i.ownerType === '22_00018-102')
})
}}
/>
@@ -327,6 +327,7 @@
const res = await deleteFileByIdApi({ ids })
if (res.type) {
$$.infoSuccess({ content: '删除成功！' });
+ setTableData(tableData.filter(item => !ids.includes(item.ownerType)))
}
},
});
@@ -365,6 +366,7 @@
return (
<Col span={12} key={t}>
<div
+ onClick={() => { x.value !== sourceType && setSourceType(x.value) }}
className={`casePerfection-cardTab-tab ${x.value === sourceType && 'casePerfection-cardTab-tabActive'}`}
>
<img src={x.value === sourceType ? personIconType(x.value)?.[1] : personIconType(x.value)?.[0]} alt="" style={{ width: '40px', height: '40px' }} />
@@ -410,6 +412,6 @@
<NewFileCheck menuList={tableData} sourceType={sourceType} />
</div>
</Modal>
- </Fragment>
+ </Fragment >
)
}
diff --git a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
index 5d1dba2..97f1cba 100644
--- a/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/FileUpLoad.jsx
@@ -3,7 +3,7 @@
import * as $$ from '@/utils/utility';
import { Form, Input, Modal, Upload } from '@arco-design/web-react';
import { IconLink } from '@arco-design/web-react/icon';
-
+import './index.less'
const FormItem = Form.Item;
const appUrl = $$.appUrl;
@@ -51,6 +51,30 @@
return (
<>
+
+ <Modal
+ style={{ width: '944px' }}
+ visible={scanImage}
+ onCancel={() => setScanImage(false)}
+ footer={null}
+ title='选择识别范围'
+ centered
+ unmountOnExit={true}
+ maskClosable={false}
+ >
+ <img
+ src={fileView?.url}
+ alt=""
+ style={{
+ display: 'block',
+ margin: 'auto',
+ maxWidth: '100%',
+ maxHeight: '100%',
+ objectFit: 'contain',
+ }}
+ />
+ <div><Button type="primary" onClick={() => handleScaned()} style={{ marginTop: '20px' }}>开始识别</Button></div>
+ </Modal>
<Modal
style={{ width: '1200px' }}
visible={visible}
@@ -105,32 +129,11 @@
</Form>
- </Modal>
+ </Modal >
<Modal
- style={{ width: '944px' }}
- visible={scanImage}
- onCancel={() => setScanImage(false)}
- footer={null}
- title='选择识别范围'
- centered
- unmountOnExit={true}
- maskClosable={false}
- >
- <img
- src={fileView?.url}
- alt=""
- style={{
- display: 'block',
- margin: 'auto',
- maxWidth: '100%',
- maxHeight: '100%',
- objectFit: 'contain',
- }}
- />
- <div><Button type="primary" onClick={() => handleScaned()} style={{ marginTop: '20px' }}>开始识别</Button></div>
- </Modal>
- <Modal
+ className='scan-modal'
style={{ width: '1200px' }}
+ wrapStyle={{ zIndex: 1002 }}
visible={scaned}
onCancel={() => setScaned(false)}
footer={null}
diff --git a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
index 97153d1..88c6b7d 100644
--- a/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/fileMessage.jsx
@@ -13,6 +13,7 @@
import RateModule from './RateModule';
import RegisInfoModule from './RegisInfoModule';
import SupervisingView from "./Supervising";
+import { useNavigate } from 'react-router-dom';
const Step = Steps.Step;
const TabPane = Tabs.TabPane;
@@ -38,6 +39,7 @@
}
const FileMessage = (props) => {
+ const navigate = useNavigate();
const caseTaskId = $$.getQueryString('caseTaskId')
const caseId = $$.getQueryString('caseId')
const [tabsActive, setTabsActive] = useState('1');
@@ -177,7 +179,7 @@
<div className="dataSync-excel">
<Space size="large" style={{ margin: '4px 14px' }}>
<Button type='primary' >导出</Button>
- <Button type='secondary' >返回上级页面</Button>
+ <Button type='secondary'onClick={() => navigate(-1)}>返回上级页面</Button>
</Space>
</div>
</>
diff --git a/gz-customerSystem/src/views/register/matterDetail/index.less b/gz-customerSystem/src/views/register/matterDetail/index.less
new file mode 100644
index 0000000..9fffc2b
--- /dev/null
+++ b/gz-customerSystem/src/views/register/matterDetail/index.less
@@ -0,0 +1,3 @@
+.scan-modal {
+
+}
\ 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 71e9caa..3883ce4 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -26,6 +26,7 @@
const [addVisabled, setAddVisabled] = useState(false);//添加当事人弹窗控制
const [fakeData, setFakeData] = useState([]);//当事人信息数据
const [scanFile, setScanFile] = useState(false);
+ const [ocrText, setOcrText] = useState('');
const [mapView, setMapView] = useState(false);
const [visible, setVisible] = useState(false);
@@ -101,7 +102,7 @@
const handleConfirm = (scanContent) => {
// 处理确认逻辑
- props.formRef.current.setFieldValue('caseDes', scanContent)
+ props.formRef.current.setFieldValue(ocrText, scanContent)
setScanFile(false);
console.log(scanContent, 'scanContent')
@@ -330,7 +331,7 @@
</Tooltip>
<div className="must" style={{ marginLeft: '4px' }}>必填</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 style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => { setScanFile(true); setOcrText('caseDes') }}>识别上传材料</div>
</div>
}
field='caseDes'
@@ -354,7 +355,7 @@
</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 style={{ marginLeft: '8px', color: '#1A6FB8', fontSize: '14px', cursor: 'pointer' }} onClick={() => { setScanFile(true); setOcrText('caseClaim') }}>识别上传材料</div>
</div>
}
field='caseClaim'
@@ -384,7 +385,7 @@
</div>
</Row>
- </Form>
+ </Form >
<Col span={24} style={{ display: 'flex', alignItems: 'center', marginBottom: '8px', marginTop: '20px' }}>
<Space size='small'>
<div className='MediationInfo-subTitle' style={{ marginTop: '-9px' }}></div><h4>事件材料</h4>
@@ -400,8 +401,6 @@
}}
/>
</div>
-
-
<DocumentScanner
visible={scanFile}
onConfirm={handleConfirm}
diff --git a/gz-customerSystem/src/views/register/visit/index.jsx b/gz-customerSystem/src/views/register/visit/index.jsx
index 42ce510..3c75e2b 100644
--- a/gz-customerSystem/src/views/register/visit/index.jsx
+++ b/gz-customerSystem/src/views/register/visit/index.jsx
@@ -1,8 +1,8 @@
/*
* @Author: dminyi 1301963064@qq.com
* @Date: 2024-08-09 09:59:43
- * @LastEditors: dminyi 1301963064@qq.com
- * @LastEditTime: 2024-09-10 10:10:03
+ * @LastEditors: lwh
+ * @LastEditTime: 2024-09-10 16:59:07
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*/
@@ -21,19 +21,19 @@
const Step = Steps.Step;
function saveDispute(data) {
- return $$.ax.request({ url: `casedraftInfo/caseDraftRegister`, type: 'post', service: 'mediate', data });
+ return $$.ax.request({ url: `casedraftInfo/caseDraftRegister`, type: 'post', service: 'mediate', data });
}
function getId() {
- return $$.ax.request({ url: `caseUtils/getNewTimeCaseId`, type: 'get', service: 'utils' });
+ return $$.ax.request({ url: `caseUtils/getNewTimeCaseId`, type: 'get', service: 'utils' });
}
function submitDispute(data) {
- return $$.ax.request({ url: `caseInfo/caseRegister`, type: 'post', service: 'mediate', data });
+ return $$.ax.request({ url: `caseInfo/caseRegister`, type: 'post', service: 'mediate', data });
}
function getDetailData(id) {
- return $$.ax.request({ url: `casedraftInfo/getCasedraftInfo?id=${id}`, type: 'get', service: 'mediate' });
+ return $$.ax.request({ url: `casedraftInfo/getCasedraftInfo?id=${id}`, type: 'get', service: 'mediate' });
}
@@ -88,12 +88,19 @@
if (!errors) {
const { myCaseType, myQuesAddress, ...rest } = formRef.current.getFields()
const params = handleData(rest)
- reauestSubmit({
- ...params,
- isSelfAccept: 0,
- isDraft: 0,
- operateType: 0,
- })
+ $$.modalInfo({
+ title: '提醒',
+ content: '确定提交吗？',
+ cancelText: '我再想想',
+ onOk: () => {
+ reauestSubmit({
+ ...params,
+ isSelfAccept: 0,
+ isDraft: 0,
+ operateType: 0,
+ })
+ },
+ });
}
});
}
diff --git a/gz-wxparty/api/api.js b/gz-wxparty/api/api.js
index 3a6da1c..bbcdd29 100644
--- a/gz-wxparty/api/api.js
+++ b/gz-wxparty/api/api.js
@@ -8,7 +8,7 @@
// === 测试环境 ===
// debug: 'https://gz.hugeinfo.com.cn/',
- debug: 'http://8pxgs3.natappfree.cc/',
+ debug: 'http://b5qpdu.natappfree.cc/',
img: 'http://120.79.193.119:9103/wx414ae04ac3f10b4e/images/',
assets: 'http://120.79.193.119:9103/wx414ae04ac3f10b4e/js/',
txt: 'http://120.79.193.119:9103/wx414ae04ac3f10b4e/txt/',
diff --git a/gz-wxparty/pages/AIAide/index.json b/gz-wxparty/pages/AIAide/index.json
index f48d0c8..9c44361 100644
--- a/gz-wxparty/pages/AIAide/index.json
+++ b/gz-wxparty/pages/AIAide/index.json
@@ -1,4 +1,4 @@
{
- "navigationBarTitleText": "解纷助手",
+ "navigationBarTitleText": "穗调解数智人",
"usingComponents": {}
}
\ No newline at end of file
diff --git a/gz-wxparty/pages/AIAideDetail/index.js b/gz-wxparty/pages/AIAideDetail/index.js
index 68555a5..4681911 100644
--- a/gz-wxparty/pages/AIAideDetail/index.js
+++ b/gz-wxparty/pages/AIAideDetail/index.js
@@ -18,7 +18,8 @@
* 页面的初始数据
*/
data: {
- data: {}
+ data: {},
+ lastData: {}
},
async getaw(data) {
@@ -39,6 +40,9 @@
let nowData = {
...options
}
+ this.setData({
+ lastData: nowData
+ })
this.getaw(nowData)
},
diff --git a/gz-wxparty/pages/AIAideDetail/index.wxml b/gz-wxparty/pages/AIAideDetail/index.wxml
index 744816f..f397c69 100644
--- a/gz-wxparty/pages/AIAideDetail/index.wxml
+++ b/gz-wxparty/pages/AIAideDetail/index.wxml
@@ -1,7 +1,22 @@
<!--pages/AIAideDetail/index.wxml-->
<view class="title">{{data.caseTitle||'-'}}</view>
<view class="line"></view>
-<view class="card">
+<view class="card" wx:if="{{lastData.type==='1'}}">
+ <view class="subtitle">【案件描述】</view>
+ <view class="text">
+ {{data.caseDesc||'-'}}
+ </view>
+ <view class="subtitle">【群众诉求】</view>
+ <view class="text">
+ {{data.caseclaim||'-'}}
+ </view>
+ <view class="subtitle">【和解协议】</view>
+ <view class="text">
+ {{data.agreecontent||'-'}}
+ </view>
+</view>
+
+<view class="card" wx:if="{{lastData.type==='2'}}">
<view class="subtitle">【案件描述】</view>
<view class="text">
{{data.caseDesc||'-'}}
diff --git a/gz-wxparty/pages/addPerson/index.js b/gz-wxparty/pages/addPerson/index.js
index 558a8df..85a8c5c 100644
--- a/gz-wxparty/pages/addPerson/index.js
+++ b/gz-wxparty/pages/addPerson/index.js
@@ -32,8 +32,8 @@
formData: {
trueName: '',
mobile: '',
- certiType: '',
- certiTypeName: '',
+ certiType: '09_00015-1',
+ certiTypeName: '身份证',
certiNo: '',
addr: '',
placeAddr: '',
diff --git a/gz-wxparty/pages/homePage/index.js b/gz-wxparty/pages/homePage/index.js
index f101002..4418f55 100644
--- a/gz-wxparty/pages/homePage/index.js
+++ b/gz-wxparty/pages/homePage/index.js
@@ -53,7 +53,8 @@
imgUrl: $$.url.img,
agreementMsg: '', // 服务协议
popupVisible: false,
- banner: [`${$$.url.img}banner-1.png`, `${$$.url.img}banner-2.jpg`, `${$$.url.img}banner-3.jpg`], // 轮播图
+ banner: [`${$$.url.img}Banner1.png`, `${$$.url.img}Banner2.png`], // 轮播图
+ // banner: [`${$$.url.img}Banner1.png`, `${$$.url.img}Banner2.png`, `${$$.url.img}banner3.png`, `${$$.url.img}banner4.png`], // 轮播图
countUnitData: {}, //化解资源
userInfo: {}, //用户信息
video: [], // 热门视频
@@ -340,6 +341,24 @@
})
},
+ // 前往查看
+ AiModalClick(e) {
+ let item = e.currentTarget.dataset.item;
+ wx.navigateTo({
+ url: '../../pages/AIAide/index?caseDes=' + item.caseDes + '&caseClaim=' + item.caseClaim + '&caseId=' + item.caseId
+ });
+ this.setData({
+ AiModal: false
+ })
+ },
+
+ // 关闭AI弹窗
+ addClosePopup() {
+ this.setData({
+ AiModal: false
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
@@ -350,6 +369,15 @@
return
}
let userInfo = wx.getStorageSync('userInfo') || {};
+ let AICase = wx.getStorageSync('AICase') || '';
+ if (AICase) {
+ this.setData({
+ AiModal: AICase
+ })
+ wx.removeStorage({
+ key: 'AICase'
+ })
+ }
let appid = wx.getAccountInfoSync().miniProgram.appId;
this.setData({
userInfo
diff --git a/gz-wxparty/pages/homePage/index.wxml b/gz-wxparty/pages/homePage/index.wxml
index ad04745..3918ed8 100644
--- a/gz-wxparty/pages/homePage/index.wxml
+++ b/gz-wxparty/pages/homePage/index.wxml
@@ -6,16 +6,23 @@
<!-- 幻灯片 -->
<view class="homePage-main">
- <swiper autoplay="{{ true }}" class="swiper" indicator-dots="{{ true }}">
- <swiper-item wx:for="{{ banner }}" wx:key="index">
- <image class="swiper-item" src="{{ item }}" />
- </swiper-item>
- </swiper>
+ <view class="swiper-bg">
+ <swiper autoplay="{{ true }}" class="swiper" indicator-dots="{{ true }}">
+ <swiper-item class="swiper-main" wx:for="{{ banner }}" wx:key="index">
+ <image class="swiper-item" src="{{ item }}" />
+ </swiper-item>
+ </swiper>
+ <view class="swiper-head">
+ <view class="mediate">
+ <view>你好，{{userInfo.trueName||'游客'}}</view>
+ <view bindtap="_handleGoPage" data-url="../../pages/me/index" wx:if="{{userInfo.realStatus===1}}" class="public-color">个人中心</view>
+ <view wx:else bindtap="handleNavigateTo" data-url="../../pages/realNameAuthentication/index" data-type="register" class="public-color">实名认证</view>
+ </view>
+ </view>
+ </view>
<view class="main">
- <view class="mediate">
- <view>你好，{{userInfo.trueName||'游客'}}</view>
- <view bindtap="_handleGoPage" data-url="../../pages/me/index" wx:if="{{userInfo.realStatus===1}}" class="public-color">个人中心</view>
- <view wx:else bindtap="handleNavigateTo" data-url="../../pages/realNameAuthentication/index" data-type="register" class="public-color">实名认证</view>
+ <view style="height: 32rpx;">
+
</view>
<!-- 服务申请 -->
<view>
@@ -67,7 +74,7 @@
<!-- 咨询动态 -->
<view>
<view class="flex_dt">
- <view class="main_title">咨询动态</view>
+ <view class="main_title">资讯动态</view>
<view bindtap="handleGetMore" data-type="newMsg" wx:if="{{ newMessageMore }}" class=" flex_dt_more">
<text>查看更多</text>
<van-icon name="arrow" size="16" />
@@ -81,7 +88,7 @@
</view>
</view>
<view class="dt_card_r">
- <image src="{{item.showUrl}}" mode="" />
+ <image src="{{item.imageUrl}}" mode="" />
</view>
</view>
</view>
@@ -130,4 +137,37 @@
<van-button bind:click="handleClickPopupMsg" block data-index="{{ index }}" data-t="0" data-item="{{ item }}" type="primary">{{ item.buttonText }}</van-button>
</view>
</van-popup>
-</block>
\ No newline at end of file
+</block>
+
+<!-- AI弹窗 -->
+
+<van-overlay show="{{ AiModal.caseDes?true:false }}" bind:click="addClosePopup">
+
+</van-overlay>
+
+<view wx:if="{{ AiModal.caseDes?true:false }}" class="AiModal-search">
+ <view class="AiModal">
+ <image src="{{imgUrl}}AICase.png" mode="" />
+ <view class="AiModal-title">穗调解数智人提醒您</view>
+ <view class="AiModal-subTitle">为了更好的帮助您解决问题，向您推荐了与您反映问题相似的典型案例和相关法条</view>
+ <van-button bind:click="AiModalClick" class="AiModal-button" round block data-item="{{ AiModal }}" type="primary">前往查看</van-button>
+ </view>
+</view>
+
+<van-overlay show="{{ showModal }}" bind:click="addClosePopup">
+
+</van-overlay>
+
+<view wx:if="{{ showModal }}" class="showModal-search">
+ <view bindtap="searchChange" class="search">
+ <view class="search-title">{{searchValue}}</view>
+ <van-icon size='9' name="{{imgUrl}}down.png" />
+ </view>
+ <view class="showModal-select">
+ <view class="showModal-select-title">办理进度</view>
+ <view bindtap="searchSelect" class="showModal-select-flex" wx:for="{{processStatusList}}" data-item="{{ item }}" data-index="{{ index }}" wx:key="index">
+ <view class="showModal-select-flex-text {{item.hover&& 'public-color'}}">{{item.label}}</view>
+ <van-icon wx:if="{{item.hover}}" size='15' name="{{imgUrl}}myRegisterList_5.png" />
+ </view>
+ </view>
+</view>
\ No newline at end of file
diff --git a/gz-wxparty/pages/homePage/index.wxss b/gz-wxparty/pages/homePage/index.wxss
index 38d767a..4b99ac8 100644
--- a/gz-wxparty/pages/homePage/index.wxss
+++ b/gz-wxparty/pages/homePage/index.wxss
@@ -172,6 +172,14 @@
align-items: center;
padding: 0 32rpx;
justify-content: space-between;
+ margin: 0 32rpx;
+}
+
+.swiper-head {
+ position: absolute;
+ width: 100%;
+ z-index: 1;
+ bottom: -64rpx;
}
.mediate-image {
@@ -405,4 +413,71 @@
padding: 32rpx 0;
margin: 0 32rpx;
border-top: 2rpx solid var(--border-color);
+}
+
+.AiModal {
+ display: flex;
+ background-color: #fff;
+ flex-direction: column;
+ margin: 120rpx 94rpx 0;
+ padding: 24rpx 40rpx;
+ align-items: center;
+ border-radius: 8px;
+}
+
+.AiModal image {
+ width: 264rpx;
+ height: 352rpx;
+ margin-bottom: 20rpx;
+}
+
+.AiModal-search {
+ position: absolute;
+ top: 96rpx;
+ width: 100%;
+ z-index: 991;
+}
+
+.AiModal-title {
+ font-size: 34rpx;
+ line-height: 50rpx;
+ color: var(--main-color);
+ margin-bottom: 24rpx;
+}
+
+.AiModal-subTitle {
+ color: rgba(23, 26, 29, 0.60);
+ text-align: center;
+ margin-bottom: 24rpx;
+}
+
+.AiModal-button {
+ width: 100%;
+}
+
+.swiper {
+ padding: 32rpx;
+}
+
+.swiper-bg {
+ position: relative;
+ background: linear-gradient(106deg, #5fa6d4 0%, #1a6fb8 100%);
+}
+
+.swiper-bg::after {
+ content: '';
+ position: absolute;
+ width: 100%;
+ height: 20px;
+ border-radius: 100%;
+ background: inherit;
+ /*继承父级背景*/
+ bottom: 0;
+ left: 50%;
+ transform: translate(-50%, 50%);
+}
+
+.swiper-main {
+ position: absolute;
+ top: 0;
}
\ No newline at end of file
diff --git a/gz-wxparty/pages/myRegisterList/index.js b/gz-wxparty/pages/myRegisterList/index.js
index f6d2055..847fb0c 100644
--- a/gz-wxparty/pages/myRegisterList/index.js
+++ b/gz-wxparty/pages/myRegisterList/index.js
@@ -147,6 +147,24 @@
}
},
+ // 前往查看
+ AiModalClick(e) {
+ let item = e.currentTarget.dataset.item;
+ wx.navigateTo({
+ url: '../../pages/AIAide/index?caseDes=' + item.caseDes + '&caseClaim=' + item.caseClaim + '&caseId=' + item.caseId
+ });
+ this.setData({
+ AiModal: false
+ })
+ },
+
+ // 关闭AI弹窗
+ addClosePopup() {
+ this.setData({
+ AiModal: false
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
@@ -154,5 +172,15 @@
this.pageQuery(this.data.search)
},
-
+ onShow() {
+ let AICase = wx.getStorageSync('AICase') || '';
+ if (AICase) {
+ this.setData({
+ AiModal: AICase
+ })
+ wx.removeStorage({
+ key: 'AICase'
+ })
+ }
+ }
})
\ No newline at end of file
diff --git a/gz-wxparty/pages/myRegisterList/index.wxml b/gz-wxparty/pages/myRegisterList/index.wxml
index e1f654e..84c756c 100644
--- a/gz-wxparty/pages/myRegisterList/index.wxml
+++ b/gz-wxparty/pages/myRegisterList/index.wxml
@@ -13,9 +13,14 @@
<view class="list" wx:for="{{dataList}}" data-item="{{ item }}" data-index="{{ index }}" wx:key="index">
<view style="{{!item.show&&'border-bottom:none'}}" class="list-top">
- <view><time-format format="YYYY年MM月DD日" value="{{item.createTime}}" />反映诉求</view>
+ <view>
+ <time-format format="YYYY年MM月DD日" value="{{item.createTime}}" />反映诉求
+ </view>
<view class="list-top-r">
- <view class="list-top-r-tag">{{item.processStatusName||'-'}}</view>
+ <view wx:if="{{item.processStatus===1}}" class="list-top-r-tag">{{item.processStatusName||'-'}}</view>
+ <view wx:if="{{item.processStatus===2}}" class="list-top-r-tag">{{item.processStatusName||'-'}}</view>
+ <view wx:if="{{item.processStatus===3}}" class="list-top-r-tag list-top-r-tag-grey">{{item.processStatusName||'-'}}</view>
+ <view wx:if="{{item.processStatus===4}}" class="list-top-r-tag">{{item.processStatusName||'-'}}</view>
<van-icon wx:if="{{item.show}}" size='16' bindtap="changeShow" data-index="{{ index }}" name="{{imgUrl}}myRegisterList_1.png" />
<van-icon wx:else size='16' bindtap="changeShow" data-index="{{ index }}" name="{{imgUrl}}myRegisterList_4.png" />
</view>
@@ -35,22 +40,31 @@
<view class="list-content-title">被申请方</view>
<view class="list-content-value">{{item.defendantNames}}</view>
</view>
+ <view wx:if="{{item.processStatus>1}}" class="list-content-flex margin-top">
+ <view class="list-content-title">承办部门</view>
+ <view class="list-content-value">{{item.mediateDeptName||'-'}}</view>
+ </view>
+ <view wx:if="{{item.processStatus>2}}" class="list-content-flex margin-top">
+ <view class="list-content-title">化解结果</view>
+ <view wx:if="{{item.mediResult===1}}" class="list-content-value green-title">{{item.mediResultName||'-'}}</view>
+ <view wx:if="{{item.mediResult===2}}" class="list-content-value red-title">{{item.mediResultName||'-'}}</view>
+ </view>
<view class="list-border"></view>
<view class="list-detail" bindtap="GoPage" data-url="{{'../../pages/myRegisterDetail/index?id='+item.id}}">
<view class="list-detail-l">
- <van-icon size='16' name="{{imgUrl}}myRegisterList_1.png" />
+ <van-icon size='16' name="{{imgUrl}}myRegisterList_6.svg" />
<view class="list-detail-title">事项详情</view>
</view>
<view class="list-detail-r">查看</view>
</view>
- <view class="list-detail" bindtap="GoPage" data-url="{{'../../pages/AIAide/index?caseDes='+item.caseDes+'&caseClaim='+item.caseClaim+'&caseId='+item.id}}">
+ <view wx:if="{{item.processStatus<3}}" class="list-detail" bindtap="GoPage" data-url="{{'../../pages/AIAide/index?caseDes='+item.caseDes+'&caseClaim='+item.caseClaim+'&caseId='+item.id}}">
<view class="list-detail-l">
- <van-icon size='16' name="{{imgUrl}}myRegisterList_2.png" />
- <view class="list-detail-title">解纷助手</view>
+ <van-icon size='16' name="{{imgUrl}}myRegisterList_7.png" />
+ <view class="list-detail-title">穗调解数智人</view>
</view>
<view class="list-detail-r">查看</view>
</view>
- <view wx:if="{{item.processStatus !==1}}" bindtap="GoPage" data-url="../../pages/myRegisterFlow/index" class="list-detail">
+ <view wx:if="{{item.processStatus>1}}" bindtap="GoPage" data-url="../../pages/myRegisterFlow/index" class="list-detail">
<view class="list-detail-l">
<van-icon size='16' name="{{imgUrl}}myRegisterList_3.png" />
<view class="list-detail-title">办理流程</view>
diff --git a/gz-wxparty/pages/myRegisterList/index.wxss b/gz-wxparty/pages/myRegisterList/index.wxss
index 525df12..e553140 100644
--- a/gz-wxparty/pages/myRegisterList/index.wxss
+++ b/gz-wxparty/pages/myRegisterList/index.wxss
@@ -82,6 +82,19 @@
color: var(--main-color);
}
+.list-top-r-tag-grey {
+ background: #f2f3f5;
+ color: #1d2129;
+}
+
+.green-title {
+ color: #00B42A;
+}
+
+.red-title {
+ color: #F53F3F;
+}
+
.list-content {
padding: 24rpx;
}
diff --git a/gz-wxparty/pages/organizeList/index.wxml b/gz-wxparty/pages/organizeList/index.wxml
index 991e464..4d2222d 100644
--- a/gz-wxparty/pages/organizeList/index.wxml
+++ b/gz-wxparty/pages/organizeList/index.wxml
@@ -12,7 +12,7 @@
<van-icon name="search" />
<van-field bind:change="handleChange" border="{{ false }}" custom-style="padding:0;background-color:#f2f3f5" data-key="keyword" placeholder="请输入中心名称" value="{{ search.keyword }}" />
<view style="color:#E5E6EB">|</view>
- <view bindtap="searchButton" class="public-color">查询</view>
+ <view bindtap="searchButton" class="ssimList-title public-color">查询</view>
</view>
</view>
</view>
@@ -24,8 +24,8 @@
<view class="card-box" wx:for="{{ data }}" wx:key="index">
<view class="card-list" bindtap="_handleGoPage" data-id="{{ item.id }}" data-url="../../pages/organizeDetail/index">
<view class="card-title">{{item.unitName}}</view>
- <view class="card-subTitle"><text class="card-subTitle-l">办公地址：</text>{{item.addr}}</view>
- <view class="card-subTitle"><text class="card-subTitle-l">联系电话：</text>{{item.dutyMobile}}</view>
+ <view class="card-subTitle"><text class="card-subTitle-l">办公地址：</text>{{item.addr||'-'}}</view>
+ <view class="card-subTitle"><text class="card-subTitle-l">联系电话：</text>{{item.dutyMobile||'-'}}</view>
</view>
</view>
<block>
diff --git a/gz-wxparty/pages/organizeList/index.wxss b/gz-wxparty/pages/organizeList/index.wxss
index 703e19e..1bacc7f 100644
--- a/gz-wxparty/pages/organizeList/index.wxss
+++ b/gz-wxparty/pages/organizeList/index.wxss
@@ -75,4 +75,9 @@
.card-subTitle-l {
color: rgba(23, 26, 29, 0.60);
+}
+
+.ssimList-title {
+ font-size: 32rpx;
+ white-space: nowrap;
}
\ No newline at end of file
diff --git a/gz-wxparty/pages/register/index.js b/gz-wxparty/pages/register/index.js
index 25b4afb..51f7e56 100644
--- a/gz-wxparty/pages/register/index.js
+++ b/gz-wxparty/pages/register/index.js
@@ -41,6 +41,16 @@
});
}
+// 获取案例
+function getCaseApi(submitData) {
+ return $$.request({
+ url: 'case-law/get-case',
+ type: 'post',
+ ai: true,
+ submitData,
+ service: 'mediate',
+ });
+}
function caseRegisterSaveApi(submitData) {
return $$.request({
@@ -455,6 +465,21 @@
saveStatus: true
})
}
+ const res1 = await getCaseApi({
+ caseDes: params.caseDes,
+ caseClaim: params.caseClaim,
+ caseId: params.id,
+ });
+ if (res1.type) {
+ wx.setStorage({
+ key: 'AICase',
+ data: {
+ caseDes: params.caseDes,
+ caseClaim: params.caseClaim,
+ caseId: params.id,
+ }
+ });
+ }
},
//选择纠纷类型 、跳转事项概况语音描述，跳转事项申请语音描述
@@ -672,7 +697,9 @@
perTypeName: '申请方当事人',
perClass: '09_01001-1',
perClassName: '自然人',
- certiNo: data.idcard || ''
+ certiNo: data.idcard || '',
+ certiType: data.certiType || '09_00015-1',
+ certiTypeName: data.certiTypeName || '身份证',
}]
})
};
diff --git a/gz-wxparty/pages/ssimList/index.wxml b/gz-wxparty/pages/ssimList/index.wxml
index 0e4dfb4..4cadeb1 100644
--- a/gz-wxparty/pages/ssimList/index.wxml
+++ b/gz-wxparty/pages/ssimList/index.wxml
@@ -14,7 +14,7 @@
<van-icon name="search" />
<van-field bind:change="handleChange" border="{{ false }}" custom-style="padding:0;background-color:#f2f3f5" data-key="keyword" placeholder="请输入中心名称" value="{{ search.keyword }}" />
<view style="color:#E5E6EB">|</view>
- <view bindtap="searchButton" class="public-color">查询</view>
+ <view bindtap="searchButton" class="ssimList-title public-color">查询</view>
</view>
</view>
</view>
@@ -27,8 +27,8 @@
<view class="card-box" wx:for="{{ data }}" wx:key="index">
<view class="card-list" bindtap="_handleGoPage" data-id="{{ item.id }}" data-url="../../pages/ssimDetail/index">
<view class="card-title">{{item.unitName}}</view>
- <view class="card-subTitle"><text class="card-subTitle-l">办公地址：</text>{{item.addr}}</view>
- <view class="card-subTitle"><text class="card-subTitle-l">联系电话：</text>{{item.dutyMobile}}</view>
+ <view class="card-subTitle"><text class="card-subTitle-l">办公地址：</text>{{item.addr||'-'}}</view>
+ <view class="card-subTitle"><text class="card-subTitle-l">联系电话：</text>{{item.dutyMobile||'-'}}</view>
</view>
</view>
<block>
diff --git a/gz-wxparty/pages/ssimList/index.wxss b/gz-wxparty/pages/ssimList/index.wxss
index 288193e..00ae0b9 100644
--- a/gz-wxparty/pages/ssimList/index.wxss
+++ b/gz-wxparty/pages/ssimList/index.wxss
@@ -74,4 +74,9 @@
.card-subTitle-l {
color: rgba(23, 26, 29, 0.60);
+}
+
+.ssimList-title {
+ font-size: 32rpx;
+ white-space: nowrap;
}
\ No newline at end of file
--
Gitblit v1.8.0