diff --git a/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js b/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js
index 9c356ee..09970eb 100644
--- a/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js
+++ b/web/client/src/sections/issueHandle/components/isuue-handle-mdal.js
@@ -6,7 +6,8 @@ import {
     ProFormSelect,
     ProFormTextArea,
     ProFormDatePicker,
-    ProFormDateRangePicker
+    ProFormDateRangePicker,
+    ProFormDependency
 } from '@ant-design/pro-form';
 import Uploads from '$components/Uploads';
 import moment from 'moment';
@@ -14,7 +15,7 @@ const FormItem = Form.Item;
 //state: 1下发未上报 2已上报待审批 3整改完成   上报结果result:  status 0 已上报未审批 1 审批通过 2 审批驳回
 export default (props) => {
     const { title, triggerRender, editData = null, onFinish, readOnly, structsUsers, user } = props;
-    const users = structsUsers?.find(s => s.id == editData?.points?.project?.id)?.users?.map(v => { return { value: v.id, label: v.name } })
+    const users = structsUsers?.find(s => s.id == editData?.points?.project?.id)?.users?.map(v => { return { value: v.id, label: v.name, ...v } })
     const formItemLayout = { labelCol: { span: 7 }, wrapperCol: { span: 16 } };
     const formRef = useRef();
 
@@ -174,7 +175,7 @@ export default (props) => {
                 name="checkPerson1"
                 label="验收人:"
                 disabled={true}
-                value={ editData?.patrolRecordIssueHandles[0]?.checkPerson?.name}
+                value={editData?.patrolRecordIssueHandles[0]?.checkPerson?.name}
             />
 
             <Form.Item label="完工图片：">
@@ -240,9 +241,10 @@ export default (props) => {
                     approveHandle(values)
                     return true;
                 } else {
+                    values.repairUnit = values?.repairUnits;
                     values.startTime = values?.dateRange[0];
                     values.endTime = values?.dateRange[1];
-                    values.repairPerson = { id: users?.find(s => s.value == values.repairPerson)?.value, name: users?.find(s => s.id == values.value)?.label }
+                    values.repairPerson = { id: users?.find(s => s.value == values.repairPerson)?.value, name: users?.find(s => s.id == values.repairPerson)?.label }
                     values.checkPerson = { id: users?.find(s => s.value == values.checkPerson)?.value, name: users?.find(s => s.id == values.value)?.label }
                     onFinish && await onFinish(values, editData)
                     //message.success('提交成功');
@@ -250,7 +252,7 @@ export default (props) => {
                 }
             }}
 
-            submitter={editData?.patrolRecordIssueHandles[0]?.state === 2 && title != '修改计划' ? {
+            submitter={editData?.patrolRecordIssueHandles[0]?.state === 2 && title != '修改计划' && title != '查看详情' ? {
                 render: (props, defaultDoms) => {
                     return [
                         <Button onClick={() => {
@@ -263,7 +265,7 @@ export default (props) => {
                         }}>驳回</Button>
                     ];
                 }
-            } : !readOnly}
+            } : (!readOnly)}
         >
             <div>
                 {/*问题记录信息*/}
@@ -271,7 +273,7 @@ export default (props) => {
 
                 {/*问题处理计划表单*/}
                 {
-                    ((editData?.patrolRecordIssueHandles?.length == 0 && !readOnly) || editData?.patrolRecordIssueHandles?.length > 0) &&
+                    ((editData?.patrolRecordIssueHandles[0].state == 1 && title != '查看详情') || editData?.patrolRecordIssueHandles[0].state > 1) &&
                     <>
                         <div className="item-title">{"维修计划信息"}</div>
                         <Row>
@@ -295,19 +297,28 @@ export default (props) => {
                                 }
                             </Col>
                             <Col span={12}>
-                                <ProFormText
-                                    name="repairUnit"
-                                    label="维修单位:"
-                                    disabled={readOnly}
-                                    rules={[
-                                        {
-                                            max: 50, message: '维修单位长度不能大于50个字符'
-                                        },
-                                        {
-                                            whitespace: true, message: '请勿输入空格'
-                                        }]}
-                                    placeholder=""
-                                />
+                                <ProFormDependency name={['repairPerson']}>
+                                    {({ repairPerson }) => {
+                                        const department = users?.find(s => s.id == repairPerson)?.department?.name
+
+                                        return (
+                                            <ProFormText
+                                                disabled={true}
+                                                name="repairUnits"
+                                                label="维修单位"
+                                                placeholder=""
+                                                fieldProps={{
+                                                    showSearch: true
+                                                }}
+                                                colProps={{
+                                                    span: 12,
+                                                }}
+                                                value={department}
+                                            />
+                                        );
+                                    }}
+                                </ProFormDependency>
+
                             </Col>
 
                             <Col span={12}>
@@ -366,7 +377,7 @@ export default (props) => {
                 }
 
                 {
-                    ((editData?.patrolRecordIssueHandles[0]?.state !== 1 || editData?.patrolRecordIssueHandles[0]?.state !== 3) && title != '修改计划' && editData?.patrolRecordIssueHandles?.length > 0) &&
+                    ((editData?.patrolRecordIssueHandles[0]?.state > 2) || title == '审核') &&
                     <>
                         <div className="item-title">{"维修计划审批"}</div>
                         <div>
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(<IssueHandleModal
                         structsUsers={structsUsers}
                         editData={record}
@@ -210,7 +210,7 @@ const PatrolRecord = (props) => {
             <div style={{ marginBottom: 20 }}>
                 <Input style={{ width: 240, marginRight: 20 }}
                     value={name} onChange={e => { setName(e.target.value) }}
-                    placeholder="请输入结构物名称或上报人" allowClear />
+                    placeholder="请输入结构物名称或点位名称" allowClear />
                 <Select
                     value={curState}
                     onChange={e => { setCurState(e) }}