fix: 合并

src/views/dyke/runManage/maintenance/maintenancePlan/index.vue

@@ -129,6 +129,15 @@ export default {
         this.dialogVisible = true
       })
     },
+    // 跳转记录页面
+    goMaintenanceRecords(row) {
+      this.$router.push({
+        path: '/maintenanceRecords',
+        query: {
+          name: row.name
+        }
+      })
+    },
     // 保存维修计划
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -254,7 +263,8 @@ export default {
           <template slot-scope="scope">
             <el-button @click="viewOrEditPlanDetails(scope.row)" type="text" size="small">查看</el-button>
             <el-button @click="viewOrEditPlanDetails(scope.row, true)" type="text" size="small">编辑</el-button>
-            <el-button style=" margin-right: 9px;" type="text" size="small">记录</el-button>
+            <el-button style=" margin-right: 9px;" type="text" size="small"
+              @click="goMaintenanceRecords(scope.row)">记录</el-button>
             <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
               title="确定删除吗？" @confirm="deleteTableItem(scope.row)">
               <el-button style="color: red;" type="text" size="small" slot="reference">删除</el-button>

src/views/dyke/runManage/maintenance/maintenanceRecords/index.vue

@@ -275,8 +275,12 @@ export default {
     }
   },
   mounted() {
+    // 拿到路由参数
+    if (this.$route.query.name) {
+      this.searchInput = this.$route.query.name
+    }
     // 获取列表数据
-    this.getTableData()
+    this.getTableData(this.$route.query.name || '')
     // 获取状态字典
     getDicts('xs_yh_record_status').then((res) => {
       if (res.data && Array.isArray(res.data)) {

src/views/sluice/runManage/maintenance/maintenancePlan/index.vue

@@ -130,6 +130,15 @@ export default {
         this.dialogVisible = true
       })
     },
+    // 跳转记录页面
+    goMaintenanceRecords(row) {
+      this.$router.push({
+        path: '/maintenanceRecords',
+        query: {
+          name: row.name
+        }
+      })
+    },
     // 保存维修计划
     submitForm(formName) {
       this.$refs[formName].validate((valid) => {
@@ -250,7 +259,8 @@ export default {
           <template slot-scope="scope">
             <el-button @click="viewOrEditPlanDetails(scope.row)" type="text" size="small">查看</el-button>
             <el-button @click="viewOrEditPlanDetails(scope.row, true)" type="text" size="small">编辑</el-button>
-            <el-button style=" margin-right: 9px;" type="text" size="small">记录</el-button>
+            <el-button style=" margin-right: 9px;" type="text" size="small"
+              @click="goMaintenanceRecords(scope.row)">记录</el-button>
             <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="el-icon-info" icon-color="red"
               title="确定删除吗？" @confirm="deleteTableItem(scope.row)">
               <el-button style="color: red;" type="text" size="small" slot="reference">删除</el-button>

src/views/sluice/runManage/maintenance/maintenanceRecords/index.vue

@@ -275,8 +275,12 @@ export default {
     }
   },
   mounted() {
+    // 拿到路由参数
+    if (this.$route.query.name) {
+      this.searchInput = this.$route.query.name
+    }
     // 获取列表数据
-    this.getTableData()
+    this.getTableData(this.$route.query.name || '')
     // 获取状态字典
     getDicts('xs_yh_record_status').then((res) => {
       if (res.data && Array.isArray(res.data)) {