diff --git a/web/client/src/sections/issueHandle/containers/patrolRecord.js b/web/client/src/sections/issueHandle/containers/patrolRecord.js
index fe33a80..16feb13 100644
--- a/web/client/src/sections/issueHandle/containers/patrolRecord.js
+++ b/web/client/src/sections/issueHandle/containers/patrolRecord.js
@@ -32,8 +32,8 @@ const PatrolRecord = (props) => {
const queryData = () => {
dispatch(patrolManage.records(`patrolRecord/all/${times[0]}/${times[1]}/true/null`)).then(res => {
if (res.success) {
- settableList(name != null ? res.payload.data?.filter(v =>
- (v.points.user.name.indexOf(name) != -1 || v.points.project.name.indexOf(name) != -1))
+ settableList(name != null ? res.payload.data
+ ?.filter(v => (v.points.itemData.name.indexOf(name) != -1 || v.points.project.name.indexOf(name) != -1))
.filter(x => curState == '全部' || curState == renderOptionText(x?.patrolRecordIssueHandles[0]?.state))
.map(v => ({ ...v, key: v.id })) : res.payload.data?.map(v => ({ ...v, key: v.id })))
}
@@ -153,7 +153,7 @@ const PatrolRecord = (props) => {
key: 'operation',
render: (text, record, index) => {
const options = [];
- if (Func.isAuthorized('ZHIDINGJIHUA') && (!record?.patrolRecordIssueHandles || record?.patrolRecordIssueHandles?.length == 0)) {
+ if (Func.isAuthorized('ZHIDINGJIHUA') && (!record?.patrolRecordIssueHandles || record?.patrolRecordIssueHandles?.length == 0 || record?.patrolRecordIssueHandles[0]?.state == 1)) {
options.push(
{
{ setName(e.target.value) }}
- placeholder="请输入结构物名称或上报人" allowClear />
+ placeholder="请输入结构物名称或点位名称" allowClear />