Commit bf194cd3 authored by denghr's avatar denghr

优化

parent 8e4857fc
...@@ -413,7 +413,7 @@ ...@@ -413,7 +413,7 @@
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
removeAppVersion(row.id).then(res=>{ removeAppVersion(row.id).then(res=>{
if (res.rel) { if (res.status==200) {
this.$notify.success({ this.$notify.success({
title: '删除成功', title: '删除成功',
message: `success` message: `success`
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<div v-for="iitem in scope.row.temp" :key="iitem.day" v-if="iitem.time == item.time"> <div v-for="iitem in scope.row.temp" :key="iitem.day" v-if="iitem.time == item.time">
<div v-for="ii in iitem.children" :key="ii.time" :data-ii="ii.time" :data-endhour="ii.endhour" class="ii-day" :class="ii.bg" @click="toShowDialog(scope.row, iitem, ii)"> <div v-for="ii in iitem.children" :key="ii.time" :data-ii="ii.time" :data-endhour="ii.endhour" class="ii-day" :class="ii.bg" @click="toShowDialog(scope.row, iitem, ii)">
<span v-if="ii.timeEtr == '00'" style="position: absolute;color: #fff;left: -20px;bottom: 0">{{ii.timeEtr}}</span> <span v-if="ii.timeEtr == '00'" style="position: absolute;color: #fff;left: -20px;bottom: 0">{{ii.timeEtr}}</span>
<span v-else style="position: absolute;color: #fff;top: -24px;right: 0;">{{ii.timeEtr}}</span> <span v-else style="position: relative;color: #fff;top: -24px;right: -20px;">{{ii.timeEtr}}</span>
<span style="position: absolute;color: #fff;z-index: 11;left: 0;">{{ii.timeStr}}</span> <span style="position: absolute;color: #fff;z-index: 11;left: 0;">{{ii.timeStr}}</span>
</div> </div>
</div> </div>
......
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
<el-button v-if="bookRecord_btn_prove&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small" @click="handleProve(scope.row)">通过</el-button> <el-button v-if="bookRecord_btn_prove&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small" @click="handleProve(scope.row)">通过</el-button>
<el-button v-if="bookRecord_btn_reject&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small" style="color: red;" @click="handleReject(scope.row)">驳回</el-button> <el-button v-if="bookRecord_btn_reject&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small" style="color: red;" @click="handleReject(scope.row)">驳回</el-button>
<template v-if="scope.row.vehicleDepartureLogVo==undefined"> <template v-if="scope.row.vehicleDepartureLogVo==undefined">
<el-button v-if="bookRecord_btn_lift&&scope.row.liftStatus==1" size="small" class="el-button el-button--text el-button--small" @click="handleLift(scope.row)">出车</el-button> <el-button v-if="bookRecord_btn_lift&&scope.row.liftStatus==1&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small" @click="handleLift(scope.row)">出车</el-button>
</template> </template>
<template v-if="scope.row.vehicleDepartureLogVo!=undefined"> <template v-if="scope.row.vehicleDepartureLogVo!=undefined">
<el-button v-if="bookRecord_btn_ret&&scope.row.vehicleDepartureLogVo.state==0&&scope.row.retStatus==1" size="small" class="el-button el-button--text el-button--small" @click="handleRet(scope.row)">收车</el-button> <el-button v-if="bookRecord_btn_ret&&scope.row.vehicleDepartureLogVo.state==0&&scope.row.retStatus==1" size="small" class="el-button el-button--text el-button--small" @click="handleRet(scope.row)">收车</el-button>
...@@ -329,7 +329,7 @@ ...@@ -329,7 +329,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="提车公里数"> <el-form-item label="提车公里数">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageStart}}KM</span> <span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageStart?detailItem.vehicleDepartureLogVo.mileageStart+'KM':''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -361,7 +361,7 @@ ...@@ -361,7 +361,7 @@
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="还车公里数"> <el-form-item label="还车公里数">
<span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageEnd}}KM</span> <span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageEnd?detailItem.vehicleDepartureLogVo.mileageEnd+'KM':''}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -1093,6 +1093,8 @@ ...@@ -1093,6 +1093,8 @@
departurePicList.push(item); departurePicList.push(item);
}); });
t.departurePicList = departurePicList; t.departurePicList = departurePicList;
}else{
t.departurePicList = [];
} }
if(row.vehicleDepartureLogVo.arrivalPic!= undefined){ if(row.vehicleDepartureLogVo.arrivalPic!= undefined){
let Arr = row.vehicleDepartureLogVo.arrivalPic.split(","); let Arr = row.vehicleDepartureLogVo.arrivalPic.split(",");
...@@ -1102,7 +1104,12 @@ ...@@ -1102,7 +1104,12 @@
arrivalPicList.push(item); arrivalPicList.push(item);
}); });
t.arrivalPicList = arrivalPicList; t.arrivalPicList = arrivalPicList;
}else{
t.arrivalPicList = [];
} }
}else{
t.departurePicList = [];
t.arrivalPicList = [];
} }
this.dialogDetailVisible = true; this.dialogDetailVisible = true;
}, },
...@@ -1559,5 +1566,5 @@ ...@@ -1559,5 +1566,5 @@
height: 110px; height: 110px;
display: block; display: block;
} }
.el-card__body,.el-card{padding: 0px;width: 110px;height: 110px;text-align: center;} .el-card__body,.el-card{padding: 0px !important;width: 150px;text-align: center;}
</style> </style>
...@@ -33,6 +33,8 @@ ...@@ -33,6 +33,8 @@
v-model="form.times" v-model="form.times"
type="datetimerange" type="datetimerange"
:picker-options="pickerOptions0" :picker-options="pickerOptions0"
format="yyyy-MM-dd HH:00:00"
value-format="yyyy-MM-dd HH:00:00"
placeholder="选择时间范围"> placeholder="选择时间范围">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-table-column type="expand"> <el-table-column type="expand">
<template scope="scope"> <template scope="scope">
<el-form label-position="left" inline class="demo-table-expand"> <el-form label-position="left" inline class="demo-table-expand">
<el-form-item label="二级分类名称"> <el-form-item label="二级分类名称" style="margin-right: 100px;">
<span v-for="item,index in scope.row.children" style="margin-right: 30px;" <span v-for="item,index in scope.row.children" style="margin-right: 30px;"
:key="item.id">{{index+1}}{{item.name}}</span> :key="item.id">{{index+1}}{{item.name}}</span>
</el-form-item> </el-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment