Skip to content

C
cloud-platform-ui
Commit d9528a91 authored by guoyou's avatar guoyou
Browse files
Options

后台优化

parent 7b612e12
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 5087 additions and 4580 deletions
src/views/baseInfo/generalSetting.vue
View file @ d9528a91
This diff is collapsed.
src/views/order/rentVehicleInfo/detail.vue
View file @ d9528a91
<template> <template>
<el-dialog title="订单详情" :visible.sync="isVisible"> <el-dialog title="订单详情" :visible.sync="isVisible">
<el-form> <el-form>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="订单号"> <el-form-item label="订单号">
<span>{{row.no}}</span> <span>{{row.no}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="支付时间"> <el-form-item label="支付时间">
<span>{{row.updTime}}</span> <span>{{row.updTime}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="订单状态"> <el-form-item label="订单状态">
<span v-if="row.status == '2'">取消</span> <span v-if="row.status == '2'">取消</span>
<span v-if="row.status == '3'">待付款</span> <span v-if="row.status == '3'">待付款</span>
<span v-if="row.status == '4'">待出行</span> <span v-if="row.status == '4'">待出行</span>
<span v-if="row.status == '5'">出行中</span> <span v-if="row.status == '5'">出行中</span>
<span v-if="row.status == '6'">已完成</span> <span v-if="row.status == '6'">已完成</span>
<span v-if="row.status == '-1'">定损中</span> <span v-if="row.status == '-1'">定损中</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="用户ID/实名"> <el-form-item label="用户ID/实名">
<span>{{row.userId}}</span>/<span>{{row.username}}</span> <span>{{row.userId}}</span>/
</el-form-item> <span>{{row.username}}</span>
</el-col> </el-form-item>
</el-row> </el-col>
<el-row> </el-row>
<el-col :span="24"> <el-row>
<el-form-item label="配车"> <el-col :span="24">
<span>{{row.vehicleNumberPlat}}</span> <el-form-item label="配车">
</el-form-item> <span>{{row.vehicleNumberPlat}}</span>
</el-col> </el-form-item>
</el-row> </el-col>
<el-row> </el-row>
<el-col :span="24"> <el-row>
<el-form-item label="取车"> <el-col :span="24">
<span>{{dateFormat(row.orderRentVehicleDetail.startTime)}}</span> <el-form-item label="取车">
<span>{{row.orderRentVehicleDetail.startCityName}}{{row.orderRentVehicleDetail.startAddr}}</span> <span>{{dateFormat(row.orderRentVehicleDetail.startTime)}}</span>
</el-form-item> <span>{{row.orderRentVehicleDetail.startCityName}}{{row.orderRentVehicleDetail.startAddr}}</span>
</el-col> </el-form-item>
</el-row> </el-col>
<el-row> </el-row>
<el-col :span="24"> <el-row>
<el-form-item label="交车公司"> <el-col :span="24">
<span>{{row.startCompanyName}}</span> <el-form-item label="交车公司">
<span>({{row.orderRentVehicleDetail.startCityName}}{{row.orderRentVehicleDetail.startAddr}})</span> <span>{{row.startCompanyName}}</span>
</el-form-item> <span>({{row.orderRentVehicleDetail.startCityName}}{{row.orderRentVehicleDetail.startAddr}})</span>
</el-col> </el-form-item>
</el-row> </el-col>
<el-row> </el-row>
<el-col :span="24"> <el-row>
<el-form-item label="还车"> <el-col :span="24">
<span>{{dateFormat(row.orderRentVehicleDetail.endTime)}}</span> <el-form-item label="还车">
<span>{{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}}</span> <span>{{dateFormat(row.orderRentVehicleDetail.endTime)}}</span>
</el-form-item> <span>{{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}}</span>
</el-col> </el-form-item>
</el-row> </el-col>
<el-row> </el-row>
<el-col :span="24"> <el-row>
<el-form-item label="收车公司"> <el-col :span="24">
<span>{{row.endCompanyName}}</span> <el-form-item label="收车公司">
<!--<span>({{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}})</span></span>--> <span>{{row.endCompanyName}}</span>
</el-form-item> <!--<span>({{row.orderRentVehicleDetail.endCityName}}{{row.orderRentVehicleDetail.endAddr}})</span></span>-->
</el-col> </el-form-item>
</el-row> </el-col>
<!--<el-table :data="tableData" border fit highlight-current-row style="width: 100%"> </el-row>
<!--<el-table :data="tableData" border fit highlight-current-row style="width: 100%">
<el-table-column width="200" align="center" label="房车"> <el-table-column width="200" align="center" label="房车">
<template scope="scope"> <template scope="scope">
<span>{{scope.no}}</span> <span>{{scope.no}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table>--> </el-table>-->
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="sure">确 定</el-button> <el-button type="primary" @click="sure">确 定</el-button>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
<script> <script>
import { import { page, saveOrderViolation } from 'api/order/rentVehicle'
page, import { mapGetters } from 'vuex'
saveOrderViolation import { formatDate } from '../../../utils/dateFormattor'
} from 'api/order/rentVehicle'; import { getToken } from '../../../utils/auth'
import {mapGetters} from 'vuex'; import { getOneIllegalRow } from 'api/order/rentVehicle'
import { import ElRow from 'element-ui/packages/row/src/row'
formatDate import ElInput from '../../../../node_modules/element-ui/packages/input/src/input.vue'
} from '../../../utils/dateFormattor'; import ElCol from 'element-ui/packages/col/src/col'
import { import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
getToken import ElForm from '../../../../node_modules/element-ui/packages/form/src/form.vue'
} from '../../../utils/auth'; export default {
import { props: ['row'],
getOneIllegalRow name: 'illegalDialog',
} from 'api/order/rentVehicle'; components: {
import ElRow from "element-ui/packages/row/src/row"; ElForm,
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue"; ElFormItem,
import ElCol from "element-ui/packages/col/src/col"; ElCol,
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue"; ElInput,
import ElForm from "../../../../node_modules/element-ui/packages/form/src/form.vue"; ElRow
export default { },
props: ["row"], data() {
name: 'illegalDialog', return {
components: { isVisible: false,
ElForm, tableData: []
ElFormItem, }
ElCol, },
ElInput, created() {
ElRow console.log(JSON.stringify(this.row))
}, },
data() { watch: {
return { isVisible(newValue, oldValue) {
isVisible: false, if (!newValue) {
tableData:[], this.$emit('detailEvent', false)
} }
}, }
created() { },
console.log(JSON.stringify(this.row)) mounted() {
let that = this
}, this.isVisible = true
watch: { },
isVisible(newValue, oldValue){ computed: {
if(!newValue){ ...mapGetters(['elements']),
this.$emit('detailEvent', false); getHeaderWithToken() {
} return { Authorization: getToken() }
}, }
}, },
mounted() { methods: {
let that = this; /**
this.isVisible = true; * 弹框-取消
}, * */
computed: { cancel() {
...mapGetters([ this.$emit('detailEvent', false)
'elements', },
]), sure: function() {
getHeaderWithToken() { this.$emit('detailEvent', false)
return {Authorization: getToken()}; },
} /**
}, * 格式化时间
methods: { * @param timestamp
/** * @returns {*}
* 弹框-取消 */
* */ dateFormat(timestamp) {
cancel() { let date = new Date(timestamp) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
this.$emit('detailEvent', false); return formatDate(date, 'yyyy-MM-dd hh:mm')
}, }
sure:function(){ }
this.$emit('detailEvent', false); }
},
/**
* 格式化时间
* @param timestamp
* @returns {*}
*/
dateFormat(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm');
},
}
}
</script> </script>
<style> <style>
.el-form-item__content{ .el-form-item__content {
display: inline-block; display: inline-block;
} }
</style> </style>
src/views/order/rentVehicleInfo/index.vue
View file @ d9528a91
This diff is collapsed.
src/views/vehicle/bookRecord/index.vue
View file @ d9528a91
This diff is collapsed.
src/views/vehicle/vehicleInfo/index.vue
View file @ d9528a91
This diff is collapsed.
src/views/vehicle/vehicleSchedulManage/index.vue
View file @ d9528a91
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<div style="color: #bfcbd9;font-size: 14px;"> <div style="color: #bfcbd9;font-size: 14px;">
现在位置：{{scope.row.parkCompanyName}} 现在位置：{{scope.row.parkCompanyName}}
</div> </div>
<div>{{scope.row.numberPlate}}<img src="../../../assets/images/detail.png" style="width: 15px;margin-left: 10px;"/></div> <div>{{scope.row.numberPlate}}<span style='color:red'>({{scope.row.code}})</span><img src="../../../assets/images/detail.png" style="width: 15px;margin-left: 10px;"/></div>
<div style="color: #bfcbd9;font-size: 14px;">{{scope.row.vehicleModel?scope.row.vehicleModel.name:''}}</div> <div style="color: #bfcbd9;font-size: 14px;">{{scope.row.vehicleModel?scope.row.vehicleModel.name:''}}</div>
</div> </div>
</template> </template>
......
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