From 77f5558eaddc89ae9a52107ef301f2ac2ff80395 Mon Sep 17 00:00:00 2001 From: wuxw <928255095@qq.com> Date: Tue, 5 Aug 2025 18:23:18 +0800 Subject: [PATCH] =?UTF-8?q?v1.9=20=E5=B7=A1=E6=A3=80=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=B8=AD=20=E4=BF=AE=E6=94=B9=E5=B7=A1=E6=A3=80=E8=B7=AF?= =?UTF-8?q?=E7=BA=BF=E6=B2=A1=E6=9C=89=E9=80=89=E6=8B=A9=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/editInspectionPlan.vue | 21 ++++++++++--------- src/components/inspection/pointRoute.vue | 3 +++ 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/components/inspection/editInspectionPlan.vue b/src/components/inspection/editInspectionPlan.vue index b1f31cb13..a6d2e6fec 100644 --- a/src/components/inspection/editInspectionPlan.vue +++ b/src/components/inspection/editInspectionPlan.vue @@ -162,19 +162,18 @@ export default { routeOptions: [], signTypeOptions: [], weekDays: [ - this.$t('inspectionPlan.monday'), - this.$t('inspectionPlan.tuesday'), - this.$t('inspectionPlan.wednesday'), - this.$t('inspectionPlan.thursday'), - this.$t('inspectionPlan.friday'), - this.$t('inspectionPlan.saturday'), - this.$t('inspectionPlan.sunday') + this.$t('addInspectionPlan.monday'), + this.$t('addInspectionPlan.tuesday'), + this.$t('addInspectionPlan.wednesday'), + this.$t('addInspectionPlan.thursday'), + this.$t('addInspectionPlan.friday'), + this.$t('addInspectionPlan.saturday'), + this.$t('addInspectionPlan.sunday') ] } }, async created() { await this.loadDictData() - this.loadRoutes() }, methods: { async loadDictData() { @@ -187,11 +186,11 @@ export default { async loadRoutes() { try { - const { data } = await listInspectionRoutes({ + const { inspectionRoutes } = await listInspectionRoutes({ page: 1, row: 100 }) - this.routeOptions = data + this.routeOptions = inspectionRoutes } catch (error) { console.error('Failed to load routes:', error) } @@ -206,6 +205,8 @@ export default { workdays: plan.inspectionWorkday ? plan.inspectionWorkday.split(',').map(Number) : [] } this.loadStaffs(plan.inspectionPlanId) + this.loadRoutes() + this.visible = true }, diff --git a/src/components/inspection/pointRoute.vue b/src/components/inspection/pointRoute.vue index 0ea4d73a8..e2ffdf189 100644 --- a/src/components/inspection/pointRoute.vue +++ b/src/components/inspection/pointRoute.vue @@ -48,12 +48,14 @@ export default { methods: { open(params) { this.pointRouteInfo.inspectionId = params.inspectionId + this.pointRouteInfo.inspectionRouteId = params.inspectionRouteId this._loadPointRouteData() }, loadData(point) { if (!point) return this.pointRouteInfo.inspectionId = point.inspectionId + this.pointRouteInfo.inspectionRouteId = point.inspectionRouteId this._loadPointRouteData() }, async _loadPointRouteData() { @@ -61,6 +63,7 @@ export default { const params = { communityId: this.communityId, inspectionId: this.pointRouteInfo.inspectionId, + inspectionRouteId: this.pointRouteInfo.inspectionRouteId, page: 1, row: 100 }