diff --git a/src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue
index 217c50f..66502d5 100644
--- a/src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/InspectionRecords/index.vue
@@ -187,7 +187,7 @@
             <el-button
               type="text"
               size="small"
-              :disabled="!scope.row.status === '1'"
+              :disabled="scope.row.status !== '1'"
               @click="handleEditDetails(scope.row, true)"
             >编辑</el-button
             >
diff --git a/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
index 03bc346..44443b4 100644
--- a/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/acceptanceRecords/index.vue
@@ -150,50 +150,42 @@
       </div>
       <el-table :height="tableHeight" :data="tableData" border>
         <el-table-column prop="id" align="center" label="单号" />
-        <el-table-column prop="name" align="center" label="巡查名称" />
-        <el-table-column prop="type" align="center" label="巡查类型">
+        <el-table-column prop="detail.name" align="center" label="巡查名称" />
+        <el-table-column align="center" label="巡查类型">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.type, "maintenanceType")
+              getDictLabelName(scope.row.detail.type, "maintenanceType")
             }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="category" align="center" label="巡查类别">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.category, "maintenanceCategory")
+              getDictLabelName(scope.row.detail.category || '', "maintenanceCategory")
             }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="status" align="center" label="巡查状态">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.status, "maintenanceStatus")
+              getDictLabelName(scope.row.detail.status || '', "maintenanceStatus")
             }}</span>
           </template>
         </el-table-column>
 
-        <el-table-column prop="level" align="center" label="问题等级">
+        <el-table-column align="center" label="问题等级">
           <template slot-scope="scope">
             <span>{{
-              getDictLabelName(scope.row.level, "maintenanceLevel")
+              getDictLabelName(scope.row.detail.problemLevel || '', "maintenanceLevel")
             }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="dutyHolderName" align="center" label="责任人" />
+        <el-table-column prop="detail.dutyHolderName" align="center" label="责任人" />
         <el-table-column
-          prop="startDate"
+          prop="submitTime"
           align="center"
-          label="巡查开始时间/结束时间"
-        >
-          <template slot-scope="scope">
-            <span
-              >{{ scope.row.startDate || "-" }}/{{
-                scope.row.endDate || "-"
-              }}</span
-            >
-          </template>
-        </el-table-column>
+          label="养护时间"
+        />
 
         <el-table-column
           prop="opera"
@@ -212,6 +204,7 @@
             <el-button
               type="text"
               size="small"
+              :disabled="scope.row.detail.status === '5'"
               @click="handleCheckDetails(scope.row, 'edit')"
               >编辑</el-button
             >
diff --git a/src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue b/src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue
index 4c3301d..a9a16ef 100644
--- a/src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue
+++ b/src/views/dike/runManage/patrolMaintenance/componentsDetails/acceptanceDetails.vue
@@ -310,11 +310,9 @@ export default {
       this.form.time = [...this.form.time]
       this.form.images = Yh.data.doc.images
       this.fileData = Yh.data.doc.docs
-      if (this.$route.query.id) {
-        const ApprovalComment = await getV2ApprovalComment(this.$route.query.id)
-        this.form.approvalTime = ApprovalComment.data.approvalTime
-        this.form.comment = ApprovalComment.data.comment
-      }
+      const ApprovalComment = await getV2ApprovalComment(this.$route.query.formId)
+      this.form.approvalTime = ApprovalComment.data.approvalTime
+      this.form.comment = ApprovalComment.data.comment
     },
 
     getDictLabelName(type, dictListName) {
diff --git a/src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue b/src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue
index b16f249..ab085da 100644
--- a/src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue
+++ b/src/views/dike/runManage/patrolMaintenance/componentsDetails/defectDetails.vue
@@ -192,7 +192,7 @@ export default {
         content: this.form.describe,
         dutyHolderId: this.form.userId,
         dutyHolderName: this.form.userName,
-        issueLevel: this.form.problemLevel,
+        problemLevel: this.form.problemLevel,
         problemId: this.$route.query.defectId,
         recordId: this.$route.query.recordId,
         startDate: this.form.time && this.form.time.length > 1 ? this.form.time[0] : '',
diff --git a/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue b/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
index c780697..02abc97 100644
--- a/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
+++ b/src/views/dike/runManage/patrolMaintenance/componentsDetails/inspectionRecordDetails.vue
@@ -424,7 +424,7 @@ export default {
         poistion: "",
         content: "",
         problemImages: [],
-        status: "4",
+        status: "0",
       });
     },
     getDictLabelName(type, dictListName) {
diff --git a/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue b/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
index e0292cf..8701640 100644
--- a/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
+++ b/src/views/dike/runManage/patrolMaintenance/componentsDetails/maintenanceDetails.vue
@@ -382,11 +382,17 @@ export default {
     handleSave(commit) {
       const data = {
         name: this.form.checkingName,
+        dikeCode: this.form.dikeCode,
+        dikeType: this.form.dikeType,
+        dikeName: this.form.dikeName,
+        status: this.form.status,
+        type: this.form.type,
+        category: this.form.category,
         checkingId: this.form.checkingId,
         content: this.form.describe,
         dutyHolderId: this.form.userId,
         dutyHolderName: this.form.userName,
-        issueLevel: this.form.problemLevel,
+        problemLevel: this.form.problemLevel,
         problemId: this.$route.query.defectId,
         recordId: this.$route.query.recordId,
         doc: {
diff --git a/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue b/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue
index 8f69556..07ee825 100644
--- a/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue
+++ b/src/views/dike/runManage/patrolMaintenance/maintenanceRecords/index.vue
@@ -216,6 +216,7 @@
             <el-button
               type="text"
               size="small"
+              :disabled="scope.row.status !== '4'"
               @click="handleCheckDetails(scope.row, 'edit')"
             >编辑</el-button
             >