diff --git a/pages/roadTransport/quantitySent/form.vue b/pages/roadTransport/quantitySent/form.vue index 8183fd0..6610b4b 100644 --- a/pages/roadTransport/quantitySent/form.vue +++ b/pages/roadTransport/quantitySent/form.vue @@ -1,6 +1,32 @@ @@ -8,15 +34,136 @@ export default { data() { return { - + roadTime:[], + unitData:[], + synthData:{ + reportPhase:'', + reportDatetime:'', + trafficOperationDescription:'' + } } }, + onLoad(options) { + let row = JSON.parse(options.item); + console.log(row) + this.synthData = row; + this.synthData.reportDatetime = this.synthData.reportDatetime ? this.synthData.reportDatetime.substring(0,10) : '' + this.getRoadTime() + }, methods: { + // 获取时段 + getRoadTime(){ + this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=1693372307694',"GET").then(res =>{ + this.roadTime = res.data + }) + }, + // 点击确认按钮 + confirmRoad(){ + let params = this.synthData; + uni.showModal({ + title:"提示", + content:"您确定，提交修改吗？", + success:(res) =>{ + if(res.confirm){ + this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/operation/saveOrUpdate',params,'POST').then(res =>{ + if(res.code == 200){ + uni.showToast({ + title:'修改成功', + icon:"none" + }); + uni.navigateBack() + } + }) + }else if(res.cancel){} + } + }) + }, + // 点击取消按钮 + cancelEdit(){ + uni.navigateBack() + }, + onchange(e){ + console.log('确定===》',e) + }, + onnodeclick(e){ + console.log('点击===》',e) + } } } - diff --git a/pages/roadTransport/quantitySent/list.vue b/pages/roadTransport/quantitySent/list.vue index 76ecbf9..ae3aeb2 100644 --- a/pages/roadTransport/quantitySent/list.vue +++ b/pages/roadTransport/quantitySent/list.vue @@ -9,8 +9,9 @@

班次环比：{{item.shiftMom}}

班次同比：{{item.shiftYoy}}

-

编辑

-

删除

+

查看详情

+

编辑

+ @@ -18,8 +19,8 @@ :content-text="contentText"> -

筛选

-

新增

+

新建

+

查询

 @@ -78,11 +79,13 @@ }, // 点击编辑按钮 - // editItem(row){ - // uni.navigateTo({ - // url:"/pages/roadTrans/editSynth?item=" + JSON.stringify(row) - // }) - // }, + editItem(row){ + console.log(row) + uni.navigateTo({ + // url:'pages/roadTransport/transportData/detail?item=' + JSON.stringify(row) + url:"/pages/roadTransport/quantitySent/form?item=" + JSON.stringify(row) + }) + }, // 点击删除按钮 deleteItem(row){ uni.showModal({ @@ -118,7 +121,8 @@ height: 100%; .top_box{ - padding-bottom: 160rpx; + // padding-bottom: 160rpx; + height: 88%; overflow-y: auto; .list_box{ width: 690rpx; @@ -146,21 +150,23 @@ margin-bottom: 20rpx; .button{ - width:200rpx; + width: 180rpx; height: 70rpx; background: #FFFFFF; - border-radius: 50rpx; - border: 1rpx solid #cdcdcd; + border-radius: 100rpx; + border: 1rpx solid #C1C1C1; display: flex; align-items: center; justify-content: center; - font-size: 26rpx; - color: #333; + font-size: 28rpx; + color: #666; margin-left: 30rpx; - &.del{ - border: 1rpx solid #D73232; - color: #D73232; + &.edit{ + background: #2D8CF0; + border-radius: 100rpx 100rpx 100rpx 100rpx; + border: none; + color: #fff; } &:last-child{ @@ -172,31 +178,34 @@ } } .bottom_box{ - width: 100%; + width: 690rpx; height: 150rpx; - background: #fff; + // background: #fff; position: fixed; bottom: 0; display: flex; - justify-content: center; + left: 50%; + transform: translateX(-50%); + justify-content: space-between; align-items: center; .btn_item{ - width: 320rpx; - height: 78rpx; - background: #FFFFFF; - border-radius: 20rpx 20rpx 20rpx 20rpx; - border: 1rpx solid #D73232; + width: 329rpx; + height: 90rpx; + margin-bottom: 20rpx; + background: #2D8CF0; + border-radius: 100rpx 100rpx 100rpx 100rpx; display: flex; align-items: center; justify-content: center; - font-size: 26rpx; - color: #D73232; + font-size: 28rpx; + color: #fff; - &:last-child { - background: #D73232; - margin-left: 50rpx; - color: #FFFFFF; + &.search { + background: #F6F6F6; + border-radius: 100rpx 100rpx 100rpx 100rpx; + color: #2D8CF0; + border: 1rpx solid #2D8CF0; } } } diff --git a/pages/roadTransport/transportData/detail-copy.vue b/pages/roadTransport/transportData/detail-copy.vue new file mode 100644 index 0000000..a2607fd --- /dev/null +++ b/pages/roadTransport/transportData/detail-copy.vue @@ -0,0 +1,383 @@ + + + + + diff --git a/pages/roadTransport/transportData/detail.vue b/pages/roadTransport/transportData/detail.vue index ccc0725..2f2085e 100644 --- a/pages/roadTransport/transportData/detail.vue +++ b/pages/roadTransport/transportData/detail.vue @@ -6,113 +6,157 @@ 管理单位 - {{roadData.organizationName}} + {{roadData.reportingUnitId}} - {{roadData.statDate}} {{roadData.statPeriodValue}} + {{roadData.statisticalDate || ''}} {{roadData.reportPhaseValue}} - - 收费站入口车辆数汇总： - {{roadData.entranceVehicleCount ? roadData.entranceVehicleCount : ''}} - - - 收费站出口车辆数汇总： - {{roadData.exitVehicleCount ? roadData.exitVehicleCount : ''}} - - - 收费站入口车辆数汇总环比： - {{roadData.entranceVehicleCountMom ? roadData.entranceVehicleCountMom + '%' : roadData.entranceVehicleCountMom == 0 ? 0 : ''}} - - - 收费站出口车辆数汇总环比： - {{roadData.exitVehicleCountMom ? roadData.exitVehicleCountMom + '%' : roadData.exitVehicleCountMom == 0 ? 0 : ''}} - - - 收费站入口车辆数汇总同比： - {{roadData.entranceVehicleCountYoy ? roadData.entranceVehicleCountYoy + '%' : roadData.entranceVehicleCountYoy == 0 ? 0 : ''}} - - - 收费站出口车辆数汇总同比： - {{roadData.exitVehicleCountYoy ? roadData.exitVehicleCountYoy + '%' : roadData.exitVehicleCountYoy == 0 ? 0 : ''}} - - - - - 收费站名称： - {{item.tollStationName}} - - - 高速公路名称： - {{item.highwayName}} - - - 收费站入口车辆数： - {{item.entranceVehicleCount}} - - - - 收费站入口车辆数环比(%) - {{item.entranceVehicleCountMom ? item.entranceVehicleCountMom + '%' : item.entranceVehicleCountMom == 0 ? 0 : ''}} - - - 收费站入口车辆数同比(%) - {{item.entranceVehicleCountYoy ? item.entranceVehicleCountYoy + '%' : item.entranceVehicleCountYoy == 0 ? 0 : ''}} - - - - 收费站出口车辆数： - {{item.exitVehicleCount}} - - - - 收费站出口车辆数环比(%) - {{item.exitVehicleCountMom ? item.exitVehicleCountMom + '%' : item.exitVehicleCountMom == 0 ? 0 : ''}} - - - 收费站出口车辆数同比(%) - {{item.exitVehicleCountYoy ? item.exitVehicleCountYoy + '%' : item.exitVehicleCountYoy == 0 ? 0 : ''}} - - - - 免收通行费车辆数： - {{item.tollExemptVehicleCount}} - - - - 免收通行费车辆数环比(%) - {{item.tollExemptVehicleCountMom ? item.tollExemptVehicleCountMom + '%' : item.tollExemptVehicleCountMom == 0 ? 0 : ''}} - - - 免收通行费车辆数同比(%) - {{item.tollExemptVehicleCountYoy ? item.tollExemptVehicleCountYoy + '%' : item.tollExemptVehicleCountYoy == 0 ? 0 : ''}} - - - - 免收通行费金额： - {{item.tollExemptAmount}} - - - 出口通行费： - {{item.exitToll}} - - - 报送人员及联系方式： - {{item.submitPersonnelContact}} + + + 负责人 + {{roadData.responsiblePersonId || ''}} + + + 联系电话 + {{roadData.contactNumber || ''}} + + + 营运收入 + {{roadData.operatingRevenue || ''}} + + + 定线通勤包车(辆)： + {{roadData.regularCommuteCharter == 0 ? 0 : roadData.regularCommuteCharter || ''}} + + + 运送农民工包车(辆)： + {{roadData.migrantWorkersCharter == 0 ? 0 : roadData.migrantWorkersCharter ||''}} + + + 除定线、农民工包车辆 + {{roadData.otherCharter == 0 ? 0 : roadData.otherCharter || ''}} + + + 投放运力：包车数 + {{roadData.capacityCharter == 0 ? 0 : roadData.capacityCharter || ''}} + + + 投放运力：班车数 + {{roadData.capacityShuttle == 0 ? 0 : roadData.capacityShuttle || ''}} + + + 投放运力：总客车数 + {{roadData.capacityTotalBus == 0 ? 0 : roadData.capacityTotalBus || ''}} + + + 定线通勤班次 + {{roadData.regularCommuteTrips == 0 ? 0 : roadData.regularCommuteTrips || ''}} + + + 运送农民工班次 + {{roadData.migrantWorkersTrips == 0 ? 0 : roadData.migrantWorkersTrips || ''}} + + + 除定线通勤包车、农民工包车班次 + {{roadData.otherTrips == 0 ? 0 : roadData.otherTrips || ''}} + + + 投放运力：包车班次 + {{roadData.capacityCharterTrips == 0 ? 0 : roadData.capacityCharterTrips || ''}} + + + 投放运力：班车班次 + {{roadData.capacityShuttleTrips == 0 ? 0 : roadData.capacityShuttleTrips || ''}} + + + 投放运力：班次 + {{roadData.capacityTotalTrips == 0 ? 0 : roadData.capacityTotalTrips || ''}} + + + 定线通勤包车客运量 + {{roadData.regularCommutePassengerVolume == 0 ? 0 : roadData.regularCommutePassengerVolume || ''}} + + + 运送农民工包车客运量(万) + {{roadData.migrantWorkersPassengerVolume == 0 ? 0 : roadData.migrantWorkersPassengerVolume || ''}} + + + 除定线通勤包车、农民工包车以外的客运量 + {{roadData.otherPassengerVolume == 0 ? 0 : roadData.otherPassengerVolume || ''}} + + + 包车客运量(万) + {{roadData.charterPassengerVolume == 0 ? 0 : roadData.charterPassengerVolume || ''}} + + + 班车客运量(万) + {{roadData.shuttlePassengerVolume == 0 ? 0 : roadData.shuttlePassengerVolume || ''}} + + + 完成客运量(万) + {{roadData.totalPassengerVolume == 0 ? 0 : roadData.totalPassengerVolume || ''}} + + + 总客位数(座) + {{roadData.totalSeatCapacity == 0 ? 0 : roadData.totalSeatCapacity || ''}} + + + 去年同期客运量(万) + {{roadData.passengerVolumeLastYear == 0 ? 0 : roadData.passengerVolumeLastYear || ''}} + + + 去年总客车量(辆) + {{roadData.totalBusLastYear == 0 ? 0 : roadData.totalBusLastYear || ''}} + + + + 客运量与去年同期比率(%) + {{roadData.passengerVolumeRatio ? roadData.passengerVolumeRatio + '%' : roadData.passengerVolumeRatio == 0 ? 0 : ''}} - - - 收起 + + 客车总量同比上升(%) + {{roadData.totalBusIncreaseRatio ? roadData.totalBusIncreaseRatio + '%' : roadData.totalBusIncreaseRatio == 0 ? 0 : ''}} - - - 收费站名称： - {{item.tollStationName}} - + + 定制客运量(万人) + {{roadData.customizedPassengerVolume == 0 ? 0 : roadData.customizedPassengerVolume || ''}} + + + 投放运力：加班数 + {{roadData.overtimeTrips == 0 ? 0 : roadData.overtimeTrips || ''}} + + + 较大以上安全事故次数 + {{roadData.significantAccidents == 0 ? 0 : roadData.significantAccidents || ''}} + + + 联网售票张数(万张) + {{roadData.onlineTicketSales == 0 ? 0 : roadData.onlineTicketSales || ''}} + + + 当日人员伤者数(人) + {{roadData.dailyInjuredPersons == 0 ? 0 : roadData.dailyInjuredPersons || ''}} + + + 交通运行情况 + {{roadData.trafficSituationReport == 0 ? 0 : roadData.trafficSituationReport || ''}} + + + 当日人员亡者数(人) + {{roadData.dailyFatalities == 0 ? 0 : roadData.dailyFatalities || ''}} + + + 应急情况报告 + {{roadData.emergencySituationReport == 0 ? 0 : roadData.emergencySituationReport || ''}} + + + 备注 + {{roadData.remarks == 0 ? 0 : roadData.remarks || ''}} -

编辑

+

编辑

 @@ -128,11 +172,11 @@ onLoad(options){ let item = JSON.parse(options.item) console.log(item) - let item1 = JSON.parse(JSON.stringify(item)) - if(item1.highwaySubDataList){ - item1.highwaySubDataList[0].isSpread = true; //显示展开收起按钮，false时为收起，true为展开 - } - this.roadData = item1 + // let item1 = JSON.parse(JSON.stringify(item)) + // if(item1.highwaySubDataList.length != 0){ + // item1.highwaySubDataList[0].isSpread = true; //显示展开收起按钮，false时为收起，true为展开 + // } + this.roadData = item // this.getDetail() }, methods: { @@ -143,11 +187,17 @@ handleSpread(item){ this.$set(item,"isSpread",true) }, - getDetail(){ - this.$request(getApp().globalData.baseUrl + '/api/biz/highSpeedOperationController/selectById/' + '8A47103EE00000018772BC97AE50FFB7',{},"GET").then(res =>{ - console.log(res) + // 点击编辑按钮 + handleEdit(){ + uni.navigateTo({ + url:"/pages/roadTransport/transportData/form?pageFrom=edit&item=" + JSON.stringify(this.roadData) }) }, + // getDetail(){ + // this.$request(getApp().globalData.baseUrl + '/api/biz/highSpeedOperationController/selectById/' + '8A47103EE00000018772BC97AE50FFB7',{},"GET").then(res =>{ + // console.log(res) + // }) + // }, } } @@ -215,33 +265,75 @@ color: #999999; } } - - .all_item{ + .top_bot{ width: 100%; - display: flex; - align-items: center; - justify-content: space-between; - margin-top: 32rpx; - - &.first{ - margin-top: 0rpx; - } - - &.last{ - margin-bottom: 30rpx; - } - - .all_left{ - color: #666666; - font-size: 26rpx; + .persent_box{ + width: 630rpx; + margin: 0 auto; + background-color: #F6F6F6; + border-radius: 30rpx; + margin-top: 30rpx; + + + .content{ + width: 576rpx; + padding: 34rpx 32rpx 30rpx 22rpx; + display: flex; + justify-content: space-between; + align-items: center; + + &.top{ + border-bottom: 1rpx solid #FFFFFF; + } + + + .left{ + font-size: 24rpx; + color: #666; + } + .right{ + color: #333; + font-size: 28rpx; + + &.green{ + color: #1ECE5F; + } + + &.red{ + color: #EB4747; + } + } + } } - - .all_right{ - font-size: 28rpx; - color: #333; + + .all_item{ + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + margin-top: 32rpx; + + &.first{ + margin-top: 0rpx; + } + + &.last{ + margin-bottom: 30rpx; + } + + .all_left{ + color: #666666; + font-size: 26rpx; + } + + .all_right{ + font-size: 28rpx; + color: #333; + } } } + .con_item{ width: 570rpx; background: #F8F8F8; diff --git a/pages/roadTransport/transportData/form.vue b/pages/roadTransport/transportData/form.vue index 28f8ba0..933708d 100644 --- a/pages/roadTransport/transportData/form.vue +++ b/pages/roadTransport/transportData/form.vue @@ -1,174 +1,272 @@ @@ -180,78 +278,118 @@ roadTime:[], unitData:[], personData:[], + isShowTitle:false, + timeName:'', + pageType:'', + index:'', roadData:{ statisticalDate:'', //统计日期 reportPhase:'', //统计时段 reportingUnitId:'', //填报单位 responsiblePersonId:'', //负责人 contactNumber:'', //联系电话 - operatingRevenue:0,//营运收入 - regularCommuteCharter:0,//定线通勤包车辆 - migrantWorkersCharter:0,//运送农民工报车辆 - otherCharter:0,//除定线、农民工包车辆 - capacityCharter:0, //投放运力：包车数 - capacityShuttle:0, //投放运力：班车数 - capacityTotalBus:0, //投放运力：总客车数 - regularCommuteTrips:0, //定线通勤班次 - migrantWorkersTrips:0, //运送农民工班次 - otherTrips:0, //除定线通勤包车、农民工包车班次 - capacityCharterTrips:0, //投放运力：包车班次 - capacityShuttleTrips:0, //投放运力：班车班次 - capacityTotalTrips:0, //投放运力：班次 - regularCommutePassengerVolume:0, //定线通勤包车客运量（万） - migrantWorkersPassengerVolume:0, //运送农民工包车客运量（万） - otherPassengerVolume:0, //除定线通勤包车、农民工包车以外的客运量（万） - charterPassengerVolume:0, //包车客运量（万） - shuttlePassengerVolume:0, //班车客运量（万） - totalPassengerVolume:0, //完成客运量（万） - totalSeatCapacity:0, //总客位数(座) - passengerVolumeLastYear:0, //去年同期客运量（万） - totalBusLastYear:0, //去年总客车量(辆) - passengerVolumeRatio:0, //客运量与去年同期比率(%) - totalBusIncreaseRatio:0, //客车总量同比上升 (%) - customizedPassengerVolume:0, //定制客运量(万人) - overtimeTrips:0, //投放运力：加班数 - significantAccidents:0, //较大以上安全事故次数 - onlineTicketSales:0, //联网售票张数(万张) - dailyInjuredPersons:0, //当日人员伤者数(人) + operatingRevenue:'',//营运收入 + regularCommuteCharter:'',//定线通勤包车辆 + migrantWorkersCharter:'',//运送农民工报车辆 + otherCharter:'',//除定线、农民工包车辆 + capacityCharter:'', //投放运力：包车数 + capacityShuttle:'', //投放运力：班车数 + capacityTotalBus:"", //投放运力：总客车数 + regularCommuteTrips:"", //定线通勤班次 + migrantWorkersTrips:"", //运送农民工班次 + otherTrips:"", //除定线通勤包车、农民工包车班次 + capacityCharterTrips:"", //投放运力：包车班次 + capacityShuttleTrips:"", //投放运力：班车班次 + capacityTotalTrips:"", //投放运力：班次 + regularCommutePassengerVolume:"", //定线通勤包车客运量(万) + migrantWorkersPassengerVolume:"", //运送农民工包车客运量(万) + otherPassengerVolume:"", //除定线通勤包车、农民工包车以外的客运量(万) + charterPassengerVolume:"", //包车客运量(万) + shuttlePassengerVolume:"", //班车客运量(万) + totalPassengerVolume:"", //完成客运量(万) + totalSeatCapacity:"", //总客位数(座) + passengerVolumeLastYear:"", //去年同期客运量(万) + totalBusLastYear:"", //去年总客车量(辆) + passengerVolumeRatio:"", //客运量与去年同期比率(%) + totalBusIncreaseRatio:"", //客车总量同比上升 (%) + customizedPassengerVolume:"", //定制客运量(万人) + overtimeTrips:"", //投放运力：加班数 + significantAccidents:"", //较大以上安全事故次数 + onlineTicketSales:"", //联网售票张数(万张) + dailyInjuredPersons:"", //当日人员伤者数(人) trafficSituationReport:'', //交通运行情况 - dailyFatalities:0, //当日人员亡者数(人) + dailyFatalities:"", //当日人员亡者数(人) emergencySituationReport:'', //应急情况报告 remarks:'', // 备注 } } }, onLoad(options){ - const item = JSON.parse(options.item); - console.log(item) - this.roadData = item this.getUnitData() this.getRoadTime() this.getPersonData() + if(options.pageFrom == 'edit'){ + const item = JSON.parse(options.item); + this.roadData = item; + + this.pageType = 'edit' + console.log(this.index) + uni.setNavigationBarTitle({ + title:"道路运输编辑" + }) + }else if(options.pageFrom == 'add'){ + this.pageType = 'add' + this.roadData.reportingUnitId = '522' + uni.setNavigationBarTitle({ + title:"道路运输新增" + }) + } + }, methods: { // 确认修改道路运输数据 confirmRoad(){ console.log('点击按钮') let params = this.roadData; - uni.showModal({ - title:"提示", - content:"您确定，提交修改吗？", - success:(res) =>{ - if(res.confirm){ - this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/saveOrUpdate',params,'POST').then(res =>{ - if(res.code == 200){ - uni.showToast({ - title:'修改成功', - icon:"none" - }); - uni.navigateBack() - } - }) - }else if(res.cancel){} - } - }) + if(params.statisticalDate == ''){ + uni.showToast({ + title:'统计日期不可为空', + icon:"none" + }) + }else if(params.reportPhase == ''){ + uni.showToast({ + title:'统计时段不可为空', + icon:"none" + }) + }else{ + uni.showModal({ + title:"提示", + content:"您确定，提交修改吗？", + success:(res) =>{ + if(res.confirm){ + this.$request(getApp().globalData.baseUrl + '/api/biz/roadtransport/road/saveOrUpdate',params,'POST').then(res =>{ + if(res.code == 200){ + if(params.id){ + uni.showToast({ + title:'修改成功', + icon:"none" + }); + }else{ + uni.showToast({ + title:'新增成功', + icon:"none" + }); + } + setTimeout(() =>{ + uni.navigateBack() + },500) + } + }) + }else if(res.cancel){} + } + }) + } + }, // 取消修改 cancelEdit(){ @@ -268,7 +406,16 @@ // 获取时段 getRoadTime(){ this.$request(getApp().globalData.baseUrl + '/api/dict/dictList?dictType=airport_time&_t=1693372307694',"GET").then(res =>{ - this.roadTime = res.data + this.roadTime = res.data; + if(this.pageType == 'edit'){ + this.roadTime.map((item,index) =>{ + if(item.dictValue == this.roadData.reportPhase){ + this.index = index; + this.timeName = item.dictLabel + } + }) + } + }) }, // 获取负责人 @@ -278,12 +425,13 @@ }) }, - onchange(e){ - console.log('确定===》',e) + // 选中时段数据 + bindPickerChange(e){ + let index = e.target.value //取其下标 + var selected = this.roadTime[index] //获取选中的数组 + this.roadData.reportPhase = selected.dictValue; + this.timeName = selected.dictLabel }, - onnodeclick(e){ - console.log('点击===》',e) - } } } @@ -294,68 +442,186 @@ height: 100%; .top_box{ - padding-bottom: 160rpx; margin-top: 30rpx; - height:100%; + height:88%; + overflow-y: auto; - .top_con{ + .top_title{ width: 690rpx; - height: 84%; - overflow-y: auto; - padding: 30rpx 0; display: flex; flex-direction: column; - margin: 0 auto; - background-color: #fff; - border-radius: 20rpx; - - .edit_item{ - width: 100%; - display: flex; - justify-content: space-between; - margin-bottom: 30rpx; - align-items: center; + align-items: center; + justify-content: center; + color: #666; + font-size: 26rpx; + line-height: 40rpx; + margin-bottom: 20rpx; + } + + .content_box{ + display: flex; + flex-direction: column; + .basic_box{ + width: 630rpx; + padding: 30rpx 30rpx; + margin: 0 auto; + background-color: #fff; + border-radius: 30rpx; + + &.data_box{ + margin-top: 30rpx; + } - &:last-child{ - margin-bottom: 0; + .con_tit{ + width: 100%; + margin-top: 10rpx; + font-size: 40rpx; + color: #333; + font-weight: bold; + margin-bottom: 9rpx; } - .left{ - margin-left: 30rpx; + .remark_item{ + color: #333; + font-size: 30rpx; + font-weight: bold; + + .left{ + margin-top: 20rpx; + margin-bottom: 30rpx; + } + + .right{ + /deep/ .is-input-border{ + border: 1rpx solid #c1c1c1 !important; + border-radius: 30rpx !important; + } + } } - .right{ - margin-right: 30rpx; + .edit_item{ + width: 100%; display: flex; + justify-content: space-between; + margin-top: 32rpx; align-items: center; + + &.input{ + margin-top: 5rpx; + } + + .left{ + // margin-left: 30rpx; + color: #666; + font-size: 26rpx; + } + .right{ + // margin-right: 30rpx; + display: flex; + align-items: center; + + + + .right_txt{ + color: #333; + font-size: 28rpx; + } + + .right_txt_box{ + display: flex; + align-items: center; + + } + + /deep/ .uni-date-editor{ + display: flex; + align-items: center; + } + /deep/ .uni-easyinput__content-input{ + font-size: 28rpx !important; + text-align: right; + color: #333; + } + + /deep/ .is-input-border { + border: none; + } + + /deep/ .content-clear-icon{ + padding: 0 !important; + } + } + } + + .per_con{ + width: 630rpx; + margin: 0 auto; + background-color: #F6F6F6; + border-radius: 30rpx; + margin-top: 30rpx; + + + .content{ + width: 576rpx; + padding: 34rpx 32rpx 30rpx 22rpx; + display: flex; + justify-content: space-between; + align-items: center; + + &.top{ + border-bottom: 1rpx solid #FFFFFF; + } + + + .left{ + font-size: 24rpx; + color: #666; + } + .right{ + color: #333; + font-size: 28rpx; + + &.green{ + color: #1ECE5F; + } + + &.red{ + color: #EB4747; + } + } + } } } } } .bottom_box{ - width: 100%; - height: 150rpx; position: fixed; + left: 0; + right: 0; bottom: 0; display: flex; - justify-content: center; - align-items: center; + justify-content: space-around; + // background-color: #F8F8F8; + padding: 0rpx 0rpx 20px; .btn_item{ - width: 320rpx; - height: 78rpx; - background: #FFFFFF; - border-radius: 40rpx; - border: 1rpx solid #D73232; + width: 329rpx; + height: 90rpx; + background: #F6F6F6; + border: 1rpx solid #C1C1C1; + color: #666; + width: 329rpx; + height: 90rpx; + line-height: 88rpx; display: flex; - align-items: center; justify-content: center; - font-size: 26rpx; - color: #D73232; + font-size: 28rpx; + font-weight: 400; + border-radius: 100rpx; - &:last-child { - background: #D73232; - margin-left: 50rpx; + &.confirm { + background: #2D8CF0; + border: 1rpx solid #2D8CF0; color: #FFFFFF; } } diff --git a/pages/roadTransport/transportData/list.vue b/pages/roadTransport/transportData/list.vue index 435492b..7b232b5 100644 --- a/pages/roadTransport/transportData/list.vue +++ b/pages/roadTransport/transportData/list.vue @@ -1,50 +1,112 @@