From eb644563d9633b2876b8a2ebbf7ea2d9c617b7de Mon Sep 17 00:00:00 2001 From: zhouxueli <2841188632@qq.com> Date: Wed, 30 Aug 2023 14:48:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/index/driverAdd.vue | 45 +++----------- src/views/index/driverManage.vue | 60 ++++--------------- src/views/index/vehicleAdd.vue | 34 ++--------- src/views/index/vehicleManage.vue | 31 +++------- .../workOrder/workOrderReconciliation.vue | 3 +- 5 files changed, 34 insertions(+), 139 deletions(-) diff --git a/src/views/index/driverAdd.vue b/src/views/index/driverAdd.vue index 1fc0f26d..84d23e36 100644 --- a/src/views/index/driverAdd.vue +++ b/src/views/index/driverAdd.vue @@ -13,7 +13,6 @@ -

{{ phoneNumberErrorMessage }}

@@ -58,13 +57,12 @@
- + @@ -183,8 +167,7 @@ export default { .wrap { background: #F4F5F7; - box-sizing: border-box; - padding: 13px; + @include sizingPadding(13px,13px); @include wh(100%, 100%); overflow-y: auto; } @@ -195,53 +178,43 @@ export default { border-radius: 10px; opacity: 0.7; border: 1px solid #FFFFFF; - @include flexCenter; - justify-content: center; + @include flexTwoCenter; img{ @include widHeiMar(9px,8px,4px); } .addTxt{ @include fontWeightSize(bolder,11px); - opacity: .7; - color: #FFFFFF; + @include colorOpa( #FFFFFF,0.7); } } - } .itemWrap { @include wh(100%, 104px); - background: #FFFFFF; - box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5); - border-radius: 6px; - margin-bottom: 10px; - box-sizing: border-box; - padding: 11px 13px 9px 15px; + @include radiusSizing(6px); @include fontWeightSize(400, 12px); @include flexBetween; - + background: #FFFFFF; + box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5); + margin-bottom: 10px; + padding: 11px 13px 9px 15px; .halfOpci { opacity: .5; margin-right: 5px; } - .allOpci { opacity: 1; } - .statusNo { color: #FF0000; } - .statusYes { color: #09B820 } } .name-status { - display: flex; - justify-content: space-between; - + @include flexColBet; .namephone { @include fontWeightSize(bold, 14px) } @@ -250,26 +223,19 @@ export default { display: flex; button { border: none; - //width: 48px; - //padding: 2px; - //@include all-height(20px); padding: 4px 8px; - display: flex; - justify-content: center; - align-items: center; border-radius: 3px; + @include flexTwoCenter; @include fontWeightSize(bold, 12px) } - .del { border: 1px solid #DDDDDD; background-color: #FFFFFF; } .revise { - color: #FFFFFF; + @include bgFontColor( #FFFFFF,#354D93); margin-left: 15px; - background: #354D93; } } diff --git a/src/views/index/vehicleAdd.vue b/src/views/index/vehicleAdd.vue index 4a3326d3..c6ee094d 100644 --- a/src/views/index/vehicleAdd.vue +++ b/src/views/index/vehicleAdd.vue @@ -65,14 +65,14 @@
- + {{item2.name }}
- + @@ -88,7 +88,6 @@ export default { data(){ return{ trailerService: '',//拖车服务 - smallRepairService: '',//小修服务 isJoin:'',//是否参与 activeIcon: require('@/assets/check.png'), inactiveIcon: require('@/assets/uncheck.png'), @@ -153,23 +152,10 @@ export default { this.selectedOption=result.vehicleType; this.serviceIds=result.serviceIds }, - change(e) { - // this.trailerService=e - console.log(" this.trailerService",e, this.result) - }, - change2(e) { - this.smallRepairService=e - }, isChange(e){ this.isJoin=e }, - cancelBtn(){//取消车辆 - this.$router.back() - }, async submitBtn(){ - // if(this.carNum || this.selectedOption || this.isJoin){ - // this.$toast('必填字段未填写') - // }else{ await saveVehicle({ vehicleId:this.id ? this.id : '', plateNumber:this.carNum ? this.carNum :'', @@ -186,7 +172,6 @@ export default { this.$router.back(); },2000) } - // }, }, components:{ CellGroup, @@ -203,10 +188,7 @@ export default { color: #323643; appearance: none; padding-right: 16px; - background-image: url('@/assets/arrow_bot.png'); - background-repeat: no-repeat; - background-position: right center; - background-size: 15px 14px; /* 自定义图像的大小 */ + background: url('@/assets/arrow_bot.png') no-repeat right center / 15px 14px; } .checkbox-group { display: none; @@ -221,8 +203,7 @@ export default { .addContentWrap{ margin-left: 16px; .itemContent{ - display: flex; - justify-content: space-between; + @include flexColBet; line-height: 56px; box-sizing: border-box; padding-right: 25px; @@ -271,11 +252,9 @@ export default { } .radioWrap{ margin-left: 10px; - //display: none; } .service{ - opacity: .7; - color: #323643; + @include colorOpa(#323643,0.7); line-height: 18px; white-space: nowrap; } @@ -291,11 +270,8 @@ export default { } } .btn{ - //margin-left: 8px; width: 90%; margin: 40px 0 30px 8px; - //position: fixed; - //bottom: 30px; } } \ No newline at end of file diff --git a/src/views/index/vehicleManage.vue b/src/views/index/vehicleManage.vue index 20062fd9..691f4c70 100644 --- a/src/views/index/vehicleManage.vue +++ b/src/views/index/vehicleManage.vue @@ -145,13 +145,8 @@ export default { @import "@/styles/mixin.scss"; @import "@/styles/common.scss"; .wrap{ - //overflow-y: auto; - //@include wh(100%,calc(100% - 46px)); - //box-sizing: border-box; - //padding: 13px 13px 0; background: #F4F5F7; - box-sizing: border-box; - padding: 13px; + @include sizingPadding(13px,13px); @include wh(100%, 100%); overflow-y: auto; } @@ -162,33 +157,26 @@ export default { border-radius: 10px; opacity: 0.7; border: 1px solid #FFFFFF; - @include flexCenter; - justify-content: center; + @include flexTwoCenter; img{ @include widHeiMar(9px,8px,4px); } .addTxt{ @include fontWeightSize(bolder,11px); - opacity: .7; - color: #FFFFFF; + @include colorOpa(#FFFFFF,0.7); } } - } .carItem{ -//position: relative; -// z-index: 11; @include wh(100%,86px); background: #FFFFFF; box-shadow: 0px 2px 10px 0px rgba(216,216,216,0.5); - border-radius: 6px; - box-sizing: border-box; + @include radiusSizing(6px); padding: 11px 13px 11px 15px; margin-bottom: 10px; @include flexBetween; .carCode{ - display: flex; - justify-content: space-between; + @include flexColBet; .codeLeft{ @include fontWeightSize(bold,14px) } @@ -196,13 +184,9 @@ export default { display: flex; button{ border: none; - //width: 48px; - //@include all-height(20px); padding: 4px 8px; - display: flex; - justify-content: center; - align-items: center; border-radius: 3px; + @include flexTwoCenter; @include fontWeightSize(bold,12px) } .del{ @@ -210,9 +194,8 @@ export default { background-color: #FFFFFF; } .revise{ - color: #FFFFFF; + @include bgFontColor( #FFFFFF,#354D93); margin-left: 15px; - background: #354D93; } } } diff --git a/src/views/workOrder/workOrderReconciliation.vue b/src/views/workOrder/workOrderReconciliation.vue index 612cbc75..1af8c0dc 100644 --- a/src/views/workOrder/workOrderReconciliation.vue +++ b/src/views/workOrder/workOrderReconciliation.vue @@ -207,7 +207,8 @@ export default { margin-bottom: 46px; .rightWrap { - @include flexBetCen; + @include flexColAround; + align-items: center; @include wh(106px, 26px); background: linear-gradient(180deg, #A3B8E9 0%, #6C81CD 100%); border-radius: 4px;