From 21e9d82923c8e60a6140a497ef41a78898c1b1b5 Mon Sep 17 00:00:00 2001 From: zhouxueli <2841188632@qq.com> Date: Wed, 19 Jun 2024 15:42:06 +0800 Subject: [PATCH] =?UTF-8?q?task#14072=EF=BC=8C=E5=90=8E=E5=8F=B0=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E6=B2=A1=E6=9C=89=E8=BF=94=E5=9B=9E=E6=8C=89=E9=92=AE?= =?UTF-8?q?=EF=BC=8C=E7=BB=88=E6=AD=A2=E5=8E=9F=E5=9B=A0=E6=94=BE=E8=BF=9B?= =?UTF-8?q?=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vehicle-maintenance/maintenance-application.vue | 13 +++++++++++-- .../vehicle-maintenance-list.vue | 6 +++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/views/vehicle-maintenance/maintenance-application.vue b/src/views/vehicle-maintenance/maintenance-application.vue index a89a2291..c0a8e148 100644 --- a/src/views/vehicle-maintenance/maintenance-application.vue +++ b/src/views/vehicle-maintenance/maintenance-application.vue @@ -101,7 +101,15 @@
维保终止
- + + + @@ -119,6 +127,7 @@ export default { detailInfo:'', show:false, auditRemark:'', + reason:'', // activeIndex:'', } }, @@ -154,7 +163,7 @@ export default { }, async handleConfirm(){ - let res=await vehicleMaintenanceStop({id:this.rowInfo.id, vehicleId:this.rowInfo.vehicleId, auditRemark:this.auditRemark,}) + let res=await vehicleMaintenanceStop({id:this.rowInfo.id, vehicleId:this.rowInfo.vehicleId, auditRemark:this.reason,}) if (res.code==200){ this.show=false await this.getDetail(); diff --git a/src/views/vehicle-maintenance/vehicle-maintenance-list.vue b/src/views/vehicle-maintenance/vehicle-maintenance-list.vue index 6fe5c8aa..847e699f 100644 --- a/src/views/vehicle-maintenance/vehicle-maintenance-list.vue +++ b/src/views/vehicle-maintenance/vehicle-maintenance-list.vue @@ -61,7 +61,7 @@ export default { }, mounted() { const urlParams = new URLSearchParams(window.location.search); - if(urlParams.get('id')){//后台进入此页面没有返回按钮 + if(urlParams.get('status')){//后台进入此页面没有返回按钮 this.isShowBackBtn=false }else{ this.isShowBackBtn=true @@ -159,10 +159,10 @@ export default { .navBar{ height: 46px; } -.listWrap{ +/*.listWrap{ height: calc(100% - 100px); overflow-y: auto; -} +}*/ .listItem{ padding: 11px 28px 11px 23px; div{