From eb65923fafe836f8fcd56d3efee4d0fd3a33ac5f Mon Sep 17 00:00:00 2001
From: dminyi <1301963064@qq.com>
Date: Tue, 10 Sep 2024 09:15:05 +0800
Subject: [PATCH] 工作台
---
gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx | 53 ++++--
gz-customerSystem/src/views/register/matterDetail/index.jsx | 3
gz-customerSystem/src/views/register/index.less | 2
gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx | 1
gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx | 15 +
gz-customerSystem/src/views/register/handleFeedback/index.jsx | 14 +
gz-customerSystem/src/views/register/eventFlow/index.jsx | 9
gz-customerSystem/src/views/register/index.jsx | 334 +++++++++++++++++++++++++++++++++++++++--
gz-customerSystem/src/utils/utility.js | 2
gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx | 8
10 files changed, 383 insertions(+), 58 deletions(-)
diff --git a/gz-customerSystem/src/utils/utility.js b/gz-customerSystem/src/utils/utility.js
index ad223f4..8eebc56 100644
--- a/gz-customerSystem/src/utils/utility.js
+++ b/gz-customerSystem/src/utils/utility.js
@@ -165,6 +165,8 @@
return info({ type: 'success', content });
}
+
+
// 手机号码正则
export const mobileRegExp = new RegExp('^1([0-9][0-9]|[0-9][0-9]|[0-9][0-9]|[0-9][0-9]|[0-9][0-9])\\d{8}$', 'g');
diff --git a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
index 0f4785b..d76dd19 100644
--- a/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/component/EventFlow.jsx
@@ -14,8 +14,8 @@
const TabPane = Tabs.TabPane;
const Step = Steps.Step;
-function getListCaseFlow(data) {
- return $$.ax.request({ url: `caseTask/listCaseFlow`, type: 'get', service: 'mediate', data });
+function getListCaseFlow(caseId) {
+ return $$.ax.request({ url: `caseTask/listCaseFlow?caseId=${caseId}`, type: 'get', service: 'mediate' });
}
function accept(data) {
@@ -35,7 +35,7 @@
const res = await accept({
caseTaskId: props.caseTaskId
})
- if(res.type) {
+ if (res.type) {
$$.infoSuccess({ content: '受理成功!' });
}
},
@@ -120,14 +120,17 @@
//获取流程信息
const getData = async () => {
- const res = await getListCaseFlow({
- caseId: props.caseId
- })
+ const res = await getListCaseFlow(
+ props.caseId
+ )
if (res.type) {
setProgressData(res.data)
}
}
+
+
+
return (
<Fragment>
<div style={{ backgroundColor: '#fff', margin: '0 16px 0px 16px', paddingTop: '16px', paddingLeft: '91px' }}>
diff --git a/gz-customerSystem/src/views/register/eventFlow/index.jsx b/gz-customerSystem/src/views/register/eventFlow/index.jsx
index 5fa937c..b96e734 100644
--- a/gz-customerSystem/src/views/register/eventFlow/index.jsx
+++ b/gz-customerSystem/src/views/register/eventFlow/index.jsx
@@ -46,6 +46,8 @@
]
const Organization = () => {
const routeData = useParams();
+ const caseTaskId = $$.getQueryString('caseTaskId')
+ const caseId = $$.getQueryString('caseId')
const [authorData, setAuthorData] = useState({});
const [tabsList, setTabsList] = useState([]);
const [tabsActive, setTabsActive] = useState();
@@ -57,8 +59,9 @@
//获取权限tab和按钮权限
const getAuthor = async () => {
+ console.log(routeData, 'routeData')
const res = await getTabButton({
- caseTaskId: routeData.caseTaskId
+ caseTaskId: caseTaskId
})
if (res.type) {
const { tabList } = res.data
@@ -83,7 +86,7 @@
//根据id定义组件
const getTypeDom = (key) => {
if (key === 'dslxq' || key === 'sxxq') {
- return <EventFlow authorData={authorData} caseId={routeData.caseId} />
+ return <EventFlow authorData={authorData} caseId={caseId} caseTaskId={caseTaskId}/>
}
if (key === 'sqjl') {
return <ApplyInfo />
@@ -93,6 +96,8 @@
}
}
+ console.log(caseId, 'caseId')
+
return (
<div style={{ position: 'relative' }}>
<NewPage
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/CaseResult.jsx
index e426f52..f5c29ad 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-08 18:25:54
+ * @LastEditTime: 2024-09-09 22:14:40
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\handleFeedback\component\CaseResult.jsx
* @Description: 结案申请
*/
@@ -26,7 +26,7 @@
-const CaseResult = ({ visible = false, handleOnCancel, caseResultId, caseId }) => {
+const CaseResult = ({ visible = false, handleOnCancel, caseResultId, caseId ,caseTaskId}) => {
const formRef = useRef();
const formRefWrite = useRef();
const failRef = useRef();
@@ -111,7 +111,9 @@
const windupApply = async (submitData) => {
const res = await windupApplyApi({
- caseResultId: caseResultId,
+ caseTaskId: caseTaskId,
+ caseId:caseId,
+ caseResultId:caseResultId,
...submitData
})
if (res.type) {
diff --git a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
index 332190d..c27d1d1 100644
--- a/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
+++ b/gz-customerSystem/src/views/register/handleFeedback/component/handle.jsx
@@ -77,8 +77,8 @@
];
-function choosePrincipalApi(id) {
- return $$.ax.request({ url: 'caseInfoUnfold/choosePrincipal?caseId=24083010062110001&userId=' + id, type: 'get', service: 'mediate' });
+function choosePrincipalApi(caseId, userId) {
+ return $$.ax.request({ url: `caseInfoUnfold/choosePrincipal?caseId=${caseId}&userId=` + userId, type: 'get', service: 'mediate' });
}
function delFile(id) {
@@ -111,7 +111,7 @@
-const Handle = () => {
+const Handle = ({ authorData, caseTaskId, caseId }) => {
const formRef = useRef();
const routeData = useParams();
const [selectedTab, setSelectedTab] = useState('1'); // 默认选中第一个 tab
@@ -131,7 +131,7 @@
const [id, setId] = useState('');
const [uniteHandleId, setUniteHandleId] = useState('');
const [caseResultId, setCaseResultId] = useState('');
-
+ const [managerName,setManagerName] = useState('')
const tabs = [
@@ -148,9 +148,8 @@
{ value: '1', label: '一' }, { value: '2', label: '二' }, { value: '3', label: '三' }
];
- const tabs2 = [
- { index: '1', label: '公共模板1:回复督办内容收到通用范本' },
- ]
+
+
const handleTabChange = (newTabIndex) => {
@@ -180,7 +179,7 @@
const choosePrincipal = async (id) => {
console.log(id, 'choosePrincipalId')
- const res = await choosePrincipalApi(id)
+ const res = await choosePrincipalApi(caseId, id)
if (res.type) {
let data = res.data
console.log(data, 'choosePrincipalchoosePrincipal')
@@ -215,24 +214,24 @@
})
if (res.type) {
$$.infoSuccess({ content: '修改成功' });
- listFeedback('24083010062110001')
+ listFeedback(caseId)
}
} else {
const res = await saveFeedbackApi({
...submitData,
- caseId: "24083010062110001",
+ caseId: caseId,
id: id,
caseTaskId: '',
})
if (res.type) {
$$.infoSuccess({ content: '保存成功' });
- listFeedback('24083010062110001')
+ listFeedback(caseId)
}
}
}
const getFeedbackInfo = async () => {
- const res = await getFeedbackInfoApi('24083010062110001')
+ const res = await getFeedbackInfoApi(caseTaskId)
setFeedbackInfoData(res.data)
console.log(res.data, 'res.data')
}
@@ -241,8 +240,10 @@
const listFeedback = async (id) => {
const res = await listFeedbackApi(id)
if (res.type) {
- let data = res.data.caseFeedbackList
+ let data = res.data.caseFeedbackList;
+ let manager = res.data.manager
setList(data)
+ setManagerName(manager)
}
}
@@ -317,10 +318,25 @@
useEffect(() => {
- listFeedback('24083010062110001');
+ listFeedback(caseId);
getFeedbackInfo();
getByIdRole();
}, [])
+
+ // useEffect(() => {
+ // if (authorData) {
+ // const { buttonList } = authorData;
+ // setStaticButtonList(myButton.filter(item => {
+ // const flag = buttonList.some(result => {
+ // if (result.id === item.key) {
+ // return true
+ // }
+ // })
+ // return flag
+ // }))
+ // }
+ // }, [authorData])
+
return (
@@ -380,7 +396,10 @@
{wantUser.wantUserId ?
<WantUserTag name={wantUser.wantUserName} onClose={() => setWantUser({ wantUserId: null, wantUserName: null })} />
:
- <Button onClick={() => setIsModalVisible(true)} style={{ color: '#1A6FB8', border: '1px solid #1A6FB8' }} type='outline'>选择</Button>
+ caseId ?
+ <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>
@@ -521,12 +540,14 @@
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])
}}
onClose={() => setIsModalVisible(false)}
+ type='person'
/>
<DocumentScanner
@@ -641,7 +662,7 @@
</Form>
</Modal>
<UniteHandle id={uniteHandleId} visible={uniteHandleView} handleOnCancel={() => setUniteHandleView(false)} />
- <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} caseResultId={caseResultId} caseId={routeData.caseId} />
+ <CaseResult visible={caseResult} handleOnCancel={() => SetCaseResult(false)} caseResultId={caseResultId} caseId={caseId} caseTaskId={caseTaskId}/>
</div>
</>
diff --git a/gz-customerSystem/src/views/register/handleFeedback/index.jsx b/gz-customerSystem/src/views/register/handleFeedback/index.jsx
index 8c2488e..97a74a8 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-08 11:53:51
+ * @LastEditTime: 2024-09-09 21:14:14
* @FilePath: \gzDyh\gz-customerSystem\src\views\basicInformation\organization\index.jsx
* @Description: 来访登记
*
@@ -48,6 +48,8 @@
const Organization = () => {
const routeData = useParams();
+ const caseTaskId = $$.getQueryString('caseTaskId')
+ const caseId = $$.getQueryString('caseId')
const [current, setCurrent] = useState(3);
const [tabsActive, setTabsActive] = useState('sxxq');
const [AiQuestionView, setAiQuestionView] = useState(false)
@@ -107,7 +109,7 @@
const getAuthor = async () => {
const res = await getTabButton({
- caseTaskId: routeData.caseTaskId
+ caseTaskId: caseTaskId
})
if (res.type) {
const { tabList } = res.data
@@ -144,7 +146,7 @@
return (
- <div style={{ position: 'relative' ,height:'100vh'}}>
+ <div style={{ position: 'relative', height: '100vh' }}>
<NewPage
pageHead={
{ breadcrumbData: [{ title: '工作台' }, { title: '事件中心' }], title: '办理反馈' }
@@ -178,16 +180,16 @@
</div>
}
{tabsActive === 'sxxq' &&
- <MatterDetail hasApplet={true} hasEditBtn={true} />
+ <MatterDetail hasApplet={true} hasEditBtn={true} authorData={authorData} />
}
{
tabsActive === 'sxbl' && <Typography.Paragraph style={style}>
- <Handle />
+ <Handle authorData={authorData} caseId={caseId} caseTaskId={caseTaskId}/>
</Typography.Paragraph>
}
{
tabsActive === 'sqjl' && <Typography.Paragraph style={style}>
- <AuditView />
+ <AuditView authorData={authorData} />
</Typography.Paragraph>
}
</TabPane>
diff --git a/gz-customerSystem/src/views/register/index.jsx b/gz-customerSystem/src/views/register/index.jsx
index 0c63274..26359b2 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-09 17:06:20
+ * @LastEditTime: 2024-09-09 22:29:34
* @FilePath: \gzDyh\gz-customerSystem\src\views\register\index.jsx
* @Description: 工作台
*/
@@ -23,6 +23,30 @@
function getCountListApi(data) {
return $$.ax.request({ url: `caseTask/getCountList`, type: 'get', service: 'mediate', data });
}
+//分派
+function pageMyTaskFpApi(data) {
+ return $$.ax.request({ url: `caseTask/pageMyTaskFp?page=1&size=10&sortType=1&sortColmn=1&status=1`, type: 'get', service: 'mediate', data });
+}
+
+//签收
+function pageMyTaskQsApi(data) {
+ return $$.ax.request({ url: `caseTask/pageMyTaskQs?page=1&size=10&sortType=1&sortColmn=1&status=1`, type: 'get', service: 'mediate', data });
+}
+
+//受理
+function pageMyTaskSlApi(data) {
+ return $$.ax.request({ url: `caseTask/pageMyTaskSl?page=1&size=10&sortType=1&sortColmn=1&status=1`, type: 'get', service: 'mediate', data });
+}
+
+//办理中
+function pageMyTaskBlzApi(data) {
+ return $$.ax.request({ url: `caseTask/pageMyTaskBlz?page=1&size=10&sortType=1&sortColmn=1&status=1`, type: 'get', service: 'mediate', data });
+}
+
+//签收
+function signApi(data) {
+ return $$.ax.request({ url: `caseTask/sign`, type: 'post', service: 'mediate', data });
+}
const VisitWorkBench = () => {
const navigate = useNavigate();
@@ -34,14 +58,14 @@
key: '1',
label: '待分派',
bgColor: '#E8F8FF',
- num: `${CountList?.waitDisp}`,
+ num: `${CountList?.waitDisp || '0'}`,
img: tab1
},
{
key: '2',
label: '待签收',
bgColor: '#E8FFEA',
- num: `${CountList?.waitSign}`,
+ num: `${CountList?.waitSign || '0'}`,
img: tab2
},
@@ -49,7 +73,7 @@
key: '3',
label: '待受理',
bgColor: '#F5E8FF',
- num: `${CountList?.waitAccept}`,
+ num: `${CountList?.waitAccept || '0'}`,
img: tab3
},
@@ -57,7 +81,7 @@
key: '4',
label: '办理中',
bgColor: '#E6FFFB',
- num: `${CountList?.waitReview}`,
+ num: `${CountList?.waitReview || '0'}`,
img: tab4
},
@@ -65,7 +89,7 @@
key: '5',
label: '待审核',
bgColor: '#E8F7FF',
- num: `${CountList?.supervise}`,
+ num: `${CountList?.supervise || '0'}`,
img: tab5
},
@@ -73,13 +97,13 @@
key: '6',
label: '督办',
bgColor: '#FFF7E6',
- num: `${CountList?.processing}`,
+ num: `${CountList?.processing || '0'}`,
img: tab6
},
]
- const fakeData1 =
+ const [fakeData1, setFakeData1] = useState(
[
{
id: 1,
@@ -293,7 +317,7 @@
},
// 更多数据...
- ]
+ ])
const [columnType, setColumnType] = useState([
{
@@ -345,8 +369,8 @@
width: 180,
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
- <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>处理</div>
</Space>
),
},
@@ -410,7 +434,120 @@
),
},
];
+ const fakeColumns3Info = [
+ {
+ title: '流转时间',
+ dataIndex: 'turnaroundTime',
+ key: 'turnaroundTime',
+ width: 100,
+ render: (text, record, index) => <span>{index + 1}</span>,
+ },
+ {
+ title: '分派时限',
+ dataIndex: 'timeLimit',
+ key: 'timeLimit',
+ width: 60,
+ },
+ {
+ title: '事项等级',
+ dataIndex: 'caseGrade',
+ key: 'caseGrade',
+ width: 180,
+ },
+ {
+ title: '事项来源',
+ dataIndex: 'caseSource',
+ key: 'caseSource',
+ width: 180,
+ },
+ {
+ title: '事项类型',
+ dataIndex: 'caseType',
+ key: 'caseType',
+ width: 180,
+ },
+ {
+ title: '申请方',
+ dataIndex: 'plaintiffs',
+ key: 'plaintiffs',
+ width: 180,
+ },
+ {
+ title: '被申请方',
+ dataIndex: 'defendants',
+ key: 'defendants',
+ width: 180,
+ },
+ {
+ title: '操作',
+ dataIndex: 'actions',
+ key: 'actions',
+ width: 180,
+ render: (text, record) => (
+ <Space style={{ color: '#1A6FB8' }}>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
+ </Space>
+ ),
+ },
+ ];
const fakeColumns1 = [
+ {
+ title: '流转时间',
+ dataIndex: 'turnaroundTime',
+ key: 'turnaroundTime',
+ width: 100,
+ render: (text, record, index) => <span>{index + 1}</span>,
+ },
+ {
+ title: '签收时限',
+ dataIndex: 'timeLimit',
+ key: 'timeLimit',
+ width: 60,
+ },
+ {
+ title: '事项等级',
+ dataIndex: 'caseGrade',
+ key: 'caseGrade',
+ width: 180,
+ },
+ {
+ title: '事项来源',
+ dataIndex: 'caseSource',
+ key: 'caseSource',
+ width: 180,
+ },
+ {
+ title: '事项类型',
+ dataIndex: 'caseType',
+ key: 'caseType',
+ width: 180,
+ },
+ {
+ title: '申请方',
+ dataIndex: 'plaintiffs',
+ key: 'plaintiffs',
+ width: 180,
+ },
+ {
+ title: '被申请方',
+ dataIndex: 'defendants',
+ key: 'defendants',
+ width: 180,
+ },
+ {
+ title: '操作',
+ dataIndex: 'actions',
+ key: 'actions',
+ width: 180,
+ render: (text, record) => (
+ <Space style={{ color: '#1A6FB8' }}>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => handleSign(record.caseId, record.ownerId)}>签收</div>
+ </Space>
+ ),
+ },
+ ];
+ const fakeColumns1Info = [
{
title: '流转时间',
dataIndex: 'turnaroundTime',
@@ -518,13 +655,12 @@
render: (text, record) => (
<Space style={{ color: '#1A6FB8' }}>
<div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
- <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
+ <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${record.ownerId}&caseId=${record.caseId}`)} style={{ cursor: 'pointer' }}>处理</div>
</Space>
),
},
];
-
- const [column, setColumn] = useState([
+ const fakeColumns2Info = [
{
title: '流转时间',
dataIndex: 'turnaroundTime',
@@ -532,9 +668,9 @@
width: 100,
},
{
- title: '已办天数',
- dataIndex: 'processingDays',
- key: 'processingDays',
+ title: '受理时限',
+ dataIndex: 'timeLimit',
+ key: 'timeLimit',
width: 60,
},
{
@@ -554,6 +690,63 @@
dataIndex: 'caseType',
key: 'caseType',
width: 180,
+ },
+ {
+ title: '申请方',
+ dataIndex: 'plaintiffs',
+ key: 'plaintiffs',
+ width: 180,
+ },
+ {
+ title: '被申请方',
+ dataIndex: 'defendants',
+ key: 'defendants',
+ width: 180,
+ },
+ {
+ title: '操作',
+ dataIndex: 'actions',
+ key: 'actions',
+ width: 180,
+ render: (text, record) => (
+ <Space style={{ color: '#1A6FB8' }}>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
+ <div onClick={() => navigate(`/mediate/visit/eventFlow?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
+ </Space>
+ ),
+ },
+ ];
+
+ const [column, setColumn] = useState([
+ {
+ title: '流转时间',
+ dataIndex: 'turnaroundTime',
+ key: 'turnaroundTime',
+ width: 100,
+ },
+ {
+ title: '已办天数',
+ dataIndex: 'processingDays',
+ key: 'processingDays',
+ width: 100,
+ },
+ {
+ title: '事项等级',
+ dataIndex: 'caseGrade',
+ key: 'caseGrade',
+ width: 100,
+ },
+ {
+ title: '事项来源',
+ dataIndex: 'caseSource',
+ key: 'caseSource',
+ width: 100,
+ },
+ {
+ title: '事项类型',
+ dataIndex: 'caseType',
+ key: 'caseType',
+ width: 100,
},
{
title: '承办部门',
@@ -592,8 +785,8 @@
width: 180,
render: (text, record) => (
<Space>
- <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>详情</div>
- <div onClick={() => navigate(`/mediate/visit/handleFeedback?caseTaskId=${'1'}&caseId=${'1'}`)} style={{ cursor: 'pointer' }}>处理</div>
+ <div onClick={() => navigate(`/mediate/visit/fileMessage?caseTaskId=${'1'}&caseId=${'1'}`)} 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>
),
},
@@ -739,6 +932,74 @@
},
])
+ const sign = async (caseId, ownerId) => {
+ const res = await signApi({ caseId: caseId, caseTaskId: ownerId })
+ if (res.type) {
+ $$.infoSuccess('签收成功')
+ }
+
+ }
+
+ const handleSign = (caseId, ownerId) => {
+ sign(caseId, ownerId)
+ }
+
+ const pageMyTaskFpNew = async () => {
+ const res = await pageMyTaskFpApi()
+ if (res.type) {
+ setFakeData1(res.data?.content)
+ }
+ }
+
+ const pageMyTaskFp = async (type) => {
+ if (type === '1') {
+ const res = await pageMyTaskFpApi()
+ if (res.type) {
+ setFakeData1(res.data?.content)
+ }
+ }
+ if (type === '2') {
+ const res = await pageMyTaskQsApi()
+ if (res.type) {
+ setFakeData1(res.data?.content)
+ }
+ }
+ if (type === '3') {
+ const res = await pageMyTaskSlApi()
+ if (res.type) {
+ setFakeData1(res.data?.content)
+ }
+ }
+ if (type === '4') {
+ const res = await pageMyTaskBlzApi()
+ if (res.type) {
+ setFakeData1(res.data?.content)
+ }
+ }
+
+ }
+
+ const handleColumnType = (type) => {
+ console.log(type, 'type')
+ if (type === '2') {
+ if (tabActivekey === '1') {
+ setColumnType(fakeColumns3Info)
+ }
+ if (tabActivekey === '2') {
+ setColumnType(fakeColumns1Info)
+ }
+ if (tabActivekey === '3') {
+ setColumnType(fakeColumns2Info)
+ }
+ }
+ if (type === '1') {
+ if (tabActivekey === '1') {
+ setColumnType(fakeColumns3)
+ }
+ }
+
+ }
+
@@ -747,21 +1008,31 @@
setTabActivekey(key);
if (key === '1') {
setColumnType(fakeColumns3)
+ pageMyTaskFp('1')
}
if (key === '2') {
setColumnType(fakeColumns1)
+ pageMyTaskFp('2')
+
}
if (key === '3') {
setColumnType(fakeColumns2)
+ pageMyTaskFp('3')
+
}
if (key === '4') {
setColumnType(column)
+ pageMyTaskFp('4')
}
if (key === '5') {
setColumnType(backColumn)
+ pageMyTaskFp('5')
+
}
if (key === '6') {
setColumnType(mangeColumn)
+ pageMyTaskFp('6')
+
}
}
@@ -783,10 +1054,18 @@
+
+
+
+
+
+
useEffect(() => {
+
+ pageMyTaskFpNew()
// pageMyTaskBl();
getCountList();
- }, [columnType,direction])
+ }, [])
@@ -811,7 +1090,7 @@
</div>
</div>
<div className='VisitWorkBench-middle'>
- <Tabs defaultActiveTab='1'>
+ <Tabs defaultActiveTab='1' onChange={handleColumnType}>
<TabPane
// onChange={handleColumnType}
key='1'
@@ -841,7 +1120,7 @@
columns={columnType}
dataSource={fakeData1}
size="small"
- rowKey="id"
+ rowKey="caseId"
bordered={true}
// style={{ marginBottom: '65px', marginTop: '-16px' }}
rowSelection={{
@@ -864,6 +1143,17 @@
}
>
<Typography.Paragraph>
+ <TableView
+ columns={columnType}
+ dataSource={fakeData1}
+ size="small"
+ rowKey="id"
+ bordered={true}
+ // style={{ marginBottom: '65px', marginTop: '-16px' }}
+ rowSelection={{
+ type: 'Checkbox'
+ }}
+ />
</Typography.Paragraph>
</TabPane>
{tabActivekey === '4' &&
diff --git a/gz-customerSystem/src/views/register/index.less b/gz-customerSystem/src/views/register/index.less
index 463f38a..97b121f 100644
--- a/gz-customerSystem/src/views/register/index.less
+++ b/gz-customerSystem/src/views/register/index.less
@@ -845,7 +845,7 @@
background: #ffffff;
padding: 12px 16px 16px 16px;
margin-top: 12px;
-
+ height: 54vh;
}
&-bottom {
diff --git a/gz-customerSystem/src/views/register/matterDetail/index.jsx b/gz-customerSystem/src/views/register/matterDetail/index.jsx
index 8690c0f..f1a6c20 100644
--- a/gz-customerSystem/src/views/register/matterDetail/index.jsx
+++ b/gz-customerSystem/src/views/register/matterDetail/index.jsx
@@ -122,6 +122,7 @@
listIdTypeInfo()
}, [props.id])
+
//获取id
const getCaseInfo = async (id) => {
const res = await getCaseInfoApi('24083010062110001')
@@ -293,7 +294,7 @@
<div>{infoData.createTime || '-'}</div>
</Col>
</Row>
- {props.hasEditBtn && <Button type='primary' style={{ marginTop: '20px' }}>修改</Button>}
+ {/* {props.hasEditBtn && <Button type='primary' style={{ marginTop: '20px' }}>修改</Button>} */}
</div>
</Typography.Paragraph>
diff --git a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
index decb012..46ee2b8 100644
--- a/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
+++ b/gz-customerSystem/src/views/register/visit/component/visitorRegister.jsx
@@ -391,7 +391,6 @@
</Space>
</Col>
<FileTable mainId={props.mainId} fileInfoList={props.fileInfoList}/>
-
<DocumentScanner
visible={scanFile}
onConfirm={handleConfirm}
--
Gitblit v1.8.0