Skip to content

C
cloud-platform-ui
Commit 73490ef7 authored by xiaosl's avatar xiaosl
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

parents 05334fdc 197f1733
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7387 additions and 5301 deletions
src/api/appManagement/pushManagement.js 0 → 100644
View file @ 73490ef7
import fetch from 'utils/fetch';
/**
* 获取列表
* @param query
*/
export function getPushList(query) {
return fetch({
url: '/api/universal/jpush/list',
method: 'Get',
params: query
});
}
/**
* 系统发送类型
* @param query
*/
export function getSendTypeList() {
return fetch({
url: '/api/universal/jpush/sendTpyes',
method: 'Get',
});
}
/**
* 跳转页面类型
* @param query
*/
export function getJumpTypeList() {
return fetch({
url: '/api/universal/jpush/jumpTpyes',
method: 'Get',
});
}
/**
* 获取弹窗管理列表某一条数据
* @param query
*/
export function getObj(id) {
return fetch({
url: '/api/universal/jpush/getOne/'+id,
method: 'Get'
})
}
/**
* 弹窗管理--添加
* @param query
*/
export function addObj(obj) {
return fetch({
url: '/api/universal/jpush/addMessagePush',
method: 'post',
data: obj
});
}
/**
* 编辑某一条数据,上下架
* @param query
*/
export function editObj(data) {
return fetch({
url: '/api/universal/jpush/udpMessagePush',
method: 'post',
data: data
})
}
/**
* 删除数据
* @param query
*/
export function delObj(id) {
return fetch({
url: '/api/universal/jpush/del/' + id,
method: 'delete',
})
}
/**
* 立即推送
* @param query
*/
export function pushStype(query) {
return fetch({
url: '/api/universal/jpush/stype',
method: 'Get',
params: query
});
}
src/api/vehicle/vehicleInfo/index.js
View file @ 73490ef7
...@@ -63,6 +63,7 @@ export function getBookedInfo(vehicleId, yearMonth) { ...@@ -63,6 +63,7 @@ export function getBookedInfo(vehicleId, yearMonth) {
method: 'get' method: 'get'
}); });
} }
/* /*
* 根据id获取片区下省份 * 根据id获取片区下省份
* */ * */
...@@ -89,3 +90,11 @@ export function editObj(param) { ...@@ -89,3 +90,11 @@ export function editObj(param) {
data: param data: param
}); });
} }
//检查车辆编码是否存在
export function checkCode(code, id) {
return fetch({
url: '/vehicle/vehicleInfo/exist_code/' + code + '?id=' + id,
method: 'get'
});
}
src/router/index.js
View file @ 73490ef7
...@@ -334,7 +334,7 @@ export const asyncRouterMap = [{ ...@@ -334,7 +334,7 @@ export const asyncRouterMap = [{
{ {
path: 'bookRecord', path: 'bookRecord',
component: _import('vehicle/bookRecord/index'), component: _import('vehicle/bookRecord/index'),
name: '车辆申请管理', name: '车辆排班管理',
authority: 'bookRecord' authority: 'bookRecord'
}, },
{ {
...@@ -364,7 +364,7 @@ export const asyncRouterMap = [{ ...@@ -364,7 +364,7 @@ export const asyncRouterMap = [{
{ {
path: 'vehicleSchedulManage', path: 'vehicleSchedulManage',
component: _import('vehicle/vehicleSchedulManage/index'), component: _import('vehicle/vehicleSchedulManage/index'),
name: '车辆排班管理', name: '车辆排班表',
authority: 'vehicleSchedulManage' authority: 'vehicleSchedulManage'
}, },
{ {
...@@ -519,6 +519,12 @@ export const asyncRouterMap = [{ ...@@ -519,6 +519,12 @@ export const asyncRouterMap = [{
component: _import('appManagement/selectedActivities/index'), component: _import('appManagement/selectedActivities/index'),
name: '首页精选活动', name: '首页精选活动',
authority: 'selectedActivities' authority: 'selectedActivities'
},
{
path: 'pushManagement',
component: _import('appManagement/pushManagement/index'),
name: '消息推送',
authority: 'pushManagement'
} }
] ]
}, },
......
src/views/appManagement/pushManagement/index.vue 0 → 100644
View file @ 73490ef7
This diff is collapsed.
src/views/index/index.vue
View file @ 73490ef7
...@@ -522,9 +522,9 @@ ...@@ -522,9 +522,9 @@
var that = this; var that = this;
orderStatistics(4).then(res => { orderStatistics(4).then(res => {
if (res.status == 200) { if (res.status == 200) {
that.totalGmv = res.data.totalGmv that.totalGmv = res.data.totalOrders;
that.totalSecurityDeposit = res.data.totalSecurityDeposit that.totalSecurityDeposit = res.data.totalOutstandingDeposit;
that.peichang = Number(Number(res.data.totalCompensation)+Number(res.data.totalForfeit)+Number(res.data.totalPenalSum)+Number(res.data.totalPostpone)).toFixed(2) that.peichang = res.data.additionalIndemnity;
} else { } else {
this.$notify({ this.$notify({
title: '失败', title: '失败',
......
src/views/order/modal/rentOrderDetailModal.vue
View file @ 73490ef7
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="姓名:"> <el-form-item label="姓名:">
<span>{{form.username}}</span> <span>{{form.realName}}</span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
......
src/views/order/modal/tourOrderDetailModal.vue
View file @ 73490ef7
...@@ -199,14 +199,23 @@ ...@@ -199,14 +199,23 @@
if (res.status == 200) { if (res.status == 200) {
let a = res.data; let a = res.data;
this.form = a; this.form = a;
this.form.orderTourDetail.startTime = timestamp2Date(a.orderTourDetail.startTime) this.form.orderTourDetail.startTime =a.orderTourDetail.startTime? timestamp2Date(a.orderTourDetail.startTime):''
this.form.orderTourDetail.endTime = timestamp2Date(a.orderTourDetail.endTime) this.form.orderTourDetail.endTime = a.orderTourDetail.endTime?timestamp2Date(a.orderTourDetail.endTime):''
this.costDetail = JSON.parse(a.orderTourDetail.costDetail) if (a.orderTourDetail.costDetail){
var cost = ''; try {
this.costDetail.children.forEach(function(a1) { this.costDetail = JSON.parse(a.orderTourDetail.costDetail)
var detail = a1.detail==undefined?'':a1.detail var cost = '';
cost += a1.key + ":" +detail+" " if ( this.costDetail.children){
}) this.costDetail.children.forEach(function(a1) {
var detail = a1.detail==undefined?'':a1.detail
cost += a1.key + ":" +detail+" "
})
}
}catch (e) {
this.templateModel()
}
}
if (this.form.status == 2) { if (this.form.status == 2) {
this.form.ststusName = '取消'; this.form.ststusName = '取消';
} }
...@@ -237,6 +246,19 @@ ...@@ -237,6 +246,19 @@
this.$emit("tourOrderDetailDialogEvent", false); this.$emit("tourOrderDetailDialogEvent", false);
} }
}); });
},
templateModel(){
this.costDetail= {
key: undefined,
val: undefined,
children: [
{
key: undefined,
detail: undefined,
val: undefined
}
]
}
} }
} }
} }
......
src/views/order/rentVehicleInfo/index.vue
View file @ 73490ef7
This diff is collapsed.
src/views/tourManage/modal/oneTourModal.vue
View file @ 73490ef7
This diff is collapsed.
src/views/userManagement/model/memberOrderDetailModal.vue 0 → 100644
View file @ 73490ef7
<template>
<el-dialog title="会员订单详情" :visible.sync="dialogVisible" class="order-details">
<el-form :model="form" ref="form" label-width="90px">
<el-row>
<el-col :span="8">
<el-form-item label="订单号:">
<span>{{form.no}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="支付时间:">
<span>{{form.crtTime}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单状态:">
<span>{{form.status}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="姓名:">
<span>{{form.realName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号:">
<span>{{form.telephone}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="名称:">
<span>{{form.name}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="商品价格:">
<span>{{form.goodsAmount}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单价格:">
<span>{{form.orderAmount}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="实际价格:">
<span>{{form.realAmount}}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="modal_modal" v-show="resetCarVisible"></div>
</el-dialog>
</template>
<script>
import ElRow from "element-ui/packages/row/src/row";
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
import ElCol from "element-ui/packages/col/src/col";
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
export default {
props: ["memberRow"],
name: 'memberOrderDetailModal',
components: {
ElFormItem,
ElCol,
ElInput,
ElRow
},
data() {
return {
updateNumberPlat: false,//是否重新配车
dialogVisible: false,
resetCarVisible: false,
resetCarForm: {
no: '',
numberPlate: '',//重新配车车牌号
},
form: {
couponAmount: undefined,
crtHost: undefined,
crtName: undefined,
crtTime: undefined,
crtUser: undefined,
detailId: undefined,
endCompanyName: undefined,
goodsAmount: undefined,
hasDiscount: undefined,
hasMemberRight: undefined,
hasPay: undefined,
id: undefined,
name: undefined,
realName: undefined,
no: undefined,
orderAmount: undefined,
orderOrigin: undefined,
orderTourDetail: {
adultNum: undefined,
childNum: undefined,
contactEmail: undefined,
contactMan: undefined,
contactPhone: undefined,
costDetail: undefined,
crtTime: undefined,
dayNum: undefined,
endAddr: undefined,
endTime: undefined,
goodId: undefined,
hasInsure: undefined,
id: undefined,
isOutside: undefined,
orderId: undefined,
siteId: undefined,
spePriceId: undefined,
startAddr: undefined,
startCity: undefined,
startCityName: undefined,
startCompanyId: undefined,
startTime: undefined,
totalNumber: undefined,
tourUserIds: undefined,
updTime: undefined,
verificationId: undefined
},
payOrigin: undefined,
picture: undefined,
realAmount: undefined,
refundStatus: undefined,
startCompanyName: undefined,
status: undefined,
ststusName:undefined,
telephone: undefined,
type: undefined,
updTime: undefined,
userId: undefined,
username: undefined,
vehicleNumberPlat: undefined,
version: undefined,
},
rules: {
numberPlate: [
{
type: 'string',
required: true,
message: '请输入车牌号',
trigger: 'blur'
}
]
},
}
},
watch: {
dialogVisible(newValue, oldValue) {
if (!newValue) {
this.$emit("memberOrderDetailDialogEvent", this.updateNumberPlat);
}
},
},
mounted() {
this.getOrderInfo();
},
methods: {
getOrderInfo() {
this.form=this.memberRow
this.dialogVisible=true
}
}
}
</script>
<style>
.label-text {
margin-left: 10px;
margin-right: 20px;
}
.label-title {
margin-top: 10px;
}
.orderDetail tr th {
background: #eef1f6;
}
.orderDetail tr td, .orderDetail tr th {
width: 500px;
text-align: center;
border: 1px solid #dfe6ec;
margin-left: 100px;
margin-right: 100px;
padding: 10px;
}
.label-value {
margin-left: 80px;
margin-right: 100px;
}
#license-img {
width: 50px;
height: 50px;
}
.order-details .el-form-item {
margin-bottom: 10px !important;
}
.modal_modal {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
opacity: .5;
background: #000;
z-index: 2000;
}
</style>
src/views/userManagement/model/rentOrderDetailModal.vue 0 → 100644
View file @ 73490ef7
<template>
<el-dialog title="租车订单详情" :visible.sync="dialogVisible" class="order-details">
<el-form :model="form" ref="form" label-width="90px">
<el-row>
<el-col :span="8">
<el-form-item label="订单号:">
<span>{{form.no}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="支付时间:">
<span>{{form.crtTime}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单状态:">
<span>{{form.status}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="姓名:">
<span>{{form.realName}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="手机号:">
<span>{{form.telephone}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="配车:">
<span
style="margin-right: 10px;">{{form.vehicleNumberPlat?form.vehicleNumberPlat:form.vehicalNumberPlat}}</span>
<el-button size="small" type="primary" icon="edit" v-if="form.status==4" @click="resetCar">重新配车</el-button>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="取车:">
<span>{{form.orderRentVehicleDetail.startTime}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" label-width="10px">
<span>{{form.orderRentVehicleDetail.startAddr}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="交车公司:">
<span>{{form.startCompanyName}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="还车:">
<span>{{form.orderRentVehicleDetail.endTime}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" label-width="10px">
<span>{{form.orderRentVehicleDetail.endAddr}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="交车公司:">
<span>{{form.endCompanyName}}</span>
</el-form-item>
</el-col>
</el-row>
<table class="orderDetail">
<tr>
<th>房车</th>
<th>租借天数</th>
<th>费用明细</th>
</tr>
<tr>
<td>{{form.name}}{{rentCostDetail}}</td>
<td>{{form.orderRentVehicleDetail.dayNum}}天</td>
<td>{{rentCostDetail}}</td>
</tr>
<tr>
<td></td>
<td></td>
<td>共计:￥{{form.realAmount}}</td>
</tr>
</table>
<div v-if="form.orderVehicleCrosstownDto" style="margin: 20px 0;"><span
style="font-size: 18px;font-weight: bold;">驾驶人信息</span></div>
<table class="orderDetail" v-if="form.orderVehicleCrosstownDto">
<tr>
<th>姓名</th>
<th>手机号</th>
<th>身份证号</th>
<th>驾照</th>
</tr>
<tr>
<td>{{form.orderVehicleCrosstownDto.licenseName}}</td>
<td>{{form.orderVehicleCrosstownDto.licensePhone}}</td>
<td>{{form.orderVehicleCrosstownDto.licenseIdCard}}</td>
<td><img style="width: 140px;height: 140px;"
:src="form.orderVehicleCrosstownDto?form.orderVehicleCrosstownDto.licenseImg:'https://xxtest.upyuns.com/image/app/default_%20avatar.png'">
</td>
</tr>
</table>
</el-form>
<div class="modal_modal" v-show="resetCarVisible"></div>
<!-- 重新配车 -->
<el-dialog title="重新配车" :visible.sync="resetCarVisible" :append-to-body='true' :modal="false">
<el-form :model="resetCarForm" ref="carForm" :rules="rules" label-width="90px">
<el-form-item label="车牌号:" prop="numberPlate">
<el-input v-model="resetCarForm.numberPlate" placeholder="请输入重配的车牌号"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelResetCar">取消</el-button>
<el-button type="primary" @click="update('carForm')">确定</el-button>
</div>
</el-dialog>
</el-dialog>
</template>
<script>
import ElRow from "element-ui/packages/row/src/row";
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
import ElCol from "element-ui/packages/col/src/col";
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
import ElForm from "../../../../node_modules/element-ui/packages/form/src/form.vue";
import {editObj} from 'api/vehicle/vehicleInfo';
export default {
props: ["form", "rentCostDetail"],
name: 'rentOrderDetailModal',
components: {
ElFormItem,
ElCol,
ElInput,
ElRow
},
data() {
return {
updateNumberPlat: false,//是否重新配车
dialogVisible: false,
resetCarVisible: false,
resetCarForm: {
no: '',
numberPlate: '',//重新配车车牌号
},
rules: {
numberPlate: [
{
type: 'string',
required: true,
message: '请输入车牌号',
trigger: 'blur'
}
]
},
}
},
watch: {
dialogVisible(newValue, oldValue) {
if (!newValue) {
this.$emit("rentOrderDetailDialogEvent", this.updateNumberPlat);
}
},
},
mounted() {
this.dialogVisible = true;
},
methods: {
resetCar() {
this.clearFrom();
this.resetCarVisible = true
this.resetCarForm.no = this.form.no
},
cancelResetCar() {
this.resetCarVisible = false
},
clearFrom() {
this.resetCarForm = {
no: '',
numberPlate: '',//重新配车车牌号
}
}, /**
* 重新配车
* */
update(formName) {
let that = this;
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
editObj(this.resetCarForm).then(response => {
if (response.status === 200) {
this.$notify({
title: '成功',
message: '修改成功',
type: 'success',
duration: 2000
});
this.resetCarVisible = false
this.form.vehicleNumberPlat = this.resetCarForm.numberPlate
this.updateNumberPlat = true
} else {
this.$notify({
title: '失败',
message: response.message,
type: 'error',
duration: 2000
});
}
});
} else {
return false;
}
});
},
}
}
</script>
<style>
.label-text {
margin-left: 10px;
margin-right: 20px;
}
.label-title {
margin-top: 10px;
}
.orderDetail tr th {
background: #eef1f6;
}
.orderDetail tr td, .orderDetail tr th {
width: 500px;
text-align: center;
border: 1px solid #dfe6ec;
margin-left: 100px;
margin-right: 100px;
padding: 10px;
}
.label-value {
margin-left: 80px;
margin-right: 100px;
}
#license-img {
width: 50px;
height: 50px;
}
.order-details .el-form-item {
margin-bottom: 10px !important;
}
.modal_modal {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
opacity: .5;
background: #000;
z-index: 2000;
}
</style>
src/views/userManagement/model/tourOrderDetailModal.vue 0 → 100644
View file @ 73490ef7
<template>
<el-dialog title="旅游订单详情" :visible.sync="dialogVisible">
<el-form :model="form" ref="form" label-width="90px">
<el-row>
<el-col :span="8">
<el-form-item label="订单号:">
<span>{{form.no}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="支付时间:">
<span>{{form.crtTime}}</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="订单状态:">
<span>{{form.status}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="出发地:">
<span>{{form.orderTourDetail.startCityName}}{{form.orderTourDetail.startAddr}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="目的地:">
<span>{{form.orderTourDetail.endAddr}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col>
<el-form-item label="活动日期:">
<span>{{form.orderTourDetail.startTime}}~{{form.orderTourDetail.endTime}}</span>
</el-form-item>
</el-col>
</el-row>
<table class="orderDetail">
<tr>
<th>旅行</th>
<th>价格</th>
<th>人数</th>
<th>保险</th>
</tr>
<tr>
<td>{{form.name}}</td>
<td>{{tourCostDetail}}</td>
<td>成人:{{form.orderTourDetail.adultNum}} 儿童:{{form.orderTourDetail.childNum}}</td>
<td>{{insureDetail}}</td>
</tr>
<tr>
<td></td>
<td></td>
<td></td>
<td>订单金额:{{form.realAmount}}元</td>
</tr>
</table>
<div>
<div style="margin: 20px 0;"><span style="font-size: 18px;font-weight: bold;">联系人信息</span></div>
<div>
<span style="font-weight: 700">联系人：</span><span class="label-text">{{form.orderTourDetail.contactMan}}</span>
<span style="font-weight: 700">联系电话：</span><span
class="label-text">{{form.orderTourDetail.contactPhone}}</span>
<span style="font-weight: 700">Email:</span><span
class="label-text">{{form.orderTourDetail.contactEmail}}</span>
</div>
</div>
<div>
<div style="margin: 20px 0;"><span style="font-size: 18px;font-weight: bold;">出游人信息 成人{{form.orderTourDetail.adultNum}}人 儿童{{form.orderTourDetail.childNum}}人</span>
</div>
<table class="orderDetail">
<tr>
<th>身份</th>
<th>姓名</th>
<th>电话</th>
<th>身份证号</th>
</tr>
<tr v-for="(item,index) in form.orderTourDetail.userVoList " :key="index">
<td v-if="item && item.isdel == 0 && item.isChild == 0">成人</td>
<td v-if="item && item.isdel == 0 && item.isChild == 1">儿童</td>
<td v-if="item && item.isdel == 0">{{item.namename}}</td>
<td v-if="item && item.isdel == 0">{{item.phone}}</td>
<td v-if="item && item.isdel == 0">{{item.idCard}}</td>
</tr>
</table>
</div>
</el-form>
</el-dialog>
</template>
<script>
import ElRow from "element-ui/packages/row/src/row";
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
import ElCol from "element-ui/packages/col/src/col";
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
import ElForm from "../../../../node_modules/element-ui/packages/form/src/form.vue";
import {
getVehicleOrderDetail
} from 'api/vehicle/vehicleSchedulManage';
import {
timestamp2Date
} from 'utils/dateUtils';
export default {
props: ["tourRow"],
name: 'tourOrderDetailModal',
components: {
ElFormItem,
ElCol,
ElInput,
ElRow
},
data() {
return {
dialogVisible: false,
form: {
couponAmount: undefined,
crtHost: undefined,
crtName: undefined,
crtTime: undefined,
crtUser: undefined,
detailId: undefined,
endCompanyName: undefined,
goodsAmount: undefined,
hasDiscount: undefined,
hasMemberRight: undefined,
hasPay: undefined,
id: undefined,
name: undefined,
realName: undefined,
no: undefined,
orderAmount: undefined,
orderOrigin: undefined,
orderTourDetail: {
adultNum: undefined,
childNum: undefined,
contactEmail: undefined,
contactMan: undefined,
contactPhone: undefined,
costDetail: undefined,
crtTime: undefined,
dayNum: undefined,
endAddr: undefined,
endTime: undefined,
goodId: undefined,
hasInsure: undefined,
id: undefined,
isOutside: undefined,
orderId: undefined,
siteId: undefined,
spePriceId: undefined,
startAddr: undefined,
startCity: undefined,
startCityName: undefined,
startCompanyId: undefined,
startTime: undefined,
totalNumber: undefined,
tourUserIds: undefined,
updTime: undefined,
verificationId: undefined
},
payOrigin: undefined,
picture: undefined,
realAmount: undefined,
refundStatus: undefined,
startCompanyName: undefined,
status: undefined,
ststusName: undefined,
telephone: undefined,
type: undefined,
updTime: undefined,
userId: undefined,
username: undefined,
vehicleNumberPlat: undefined,
version: undefined,
},
costDetail: {
key: undefined,
val: undefined,
children: [
{
key: undefined,
detail: undefined,
val: undefined
}
]
},
insureDetail: '',//保险
tourCostDetail: ''
}
},
watch: {
dialogVisible(newValue, oldValue) {
if (!newValue) {
this.$emit("tourOrderDetailDialogEvent", false);
}
},
},
mounted() {
this.getOrderInfo();//获取订单详情
},
methods: {
//获取订单详情
getOrderInfo() {
// let params = {
// orderNo: this.tourRow.no
// };
// this.form=this.tourRow
// this.dialogVisible = true;
// getVehicleOrderDetail(params).then(res => {
// if (res.status == 200) {
let a = this.tourRow;
this.form = a;
this.form.orderTourDetail.startTime = a.orderTourDetail.startTime ? timestamp2Date(a.orderTourDetail.startTime) : ''
this.form.orderTourDetail.endTime = a.orderTourDetail.endTime ? timestamp2Date(a.orderTourDetail.endTime) : ''
if (a.orderTourDetail.costDetail) {
try {
this.costDetail = JSON.parse(a.orderTourDetail.costDetail)
var cost = '';
if (this.costDetail.children) {
this.costDetail.children.forEach(function (a1) {
var detail = a1.detail == undefined ? '' : a1.detail
cost += a1.key + ":" + detail + " "
})
}
}catch (e) {
this.templateModel()
}
}
// if (this.form.status == 2) {
// this.form.ststusName = '取消';
// }
// if (this.form.status == 3) {
// this.form.ststusName = '待付款';
// }
// if (this.form.status == 4) {
// this.form.ststusName = '待出行';
// }
// if (this.form.status == 5) {
// this.form.ststusName = '出行中';
// }
// if (this.form.status == 6) {
// this.form.ststusName = '已完成';
// }
if (a.orderTourDetail.hasInsure == 0) {
this.insureDetail = "不需要保险"
}
this.tourCostDetail = cost;
this.dialogVisible = true;
// } else {
// this.$notify({
// title: '失败',
// message: res.message,
// type: 'error',
// duration: 2000
// });
// this.$emit("tourOrderDetailDialogEvent", false);
// }
// });
},
templateModel(){
this.costDetail= {
key: undefined,
val: undefined,
children: [
{
key: undefined,
detail: undefined,
val: undefined
}
]
}
}
}
}
</script>
<style>
.label-text {
margin-left: 10px;
margin-right: 20px;
}
.label-title {
margin-top: 10px;
}
.orderDetail tr th {
background: #eef1f6;
}
.orderDetail tr td, .orderDetail tr th {
width: 500px;
text-align: center;
border: 1px solid #dfe6ec;
margin-left: 100px;
margin-right: 100px;
padding: 10px;
}
.label-value {
margin-left: 80px;
margin-right: 100px;
}
#license-img {
width: 50px;
height: 50px;
}
.order-details .el-form-item {
margin-bottom: 10px !important;
}
</style>
src/views/userManagement/userList/index.vue
View file @ 73490ef7
This diff is collapsed.
src/views/vehicle/bookRecord/index.vue
View file @ 73490ef7
This diff is collapsed.
src/views/vehicle/vehicleInfo/index.vue
View file @ 73490ef7
This diff is collapsed.
src/views/vehicle/vehicleSchedulManage/index.vue
View file @ 73490ef7
...@@ -16,6 +16,9 @@ ...@@ -16,6 +16,9 @@
<el-form-item label="车牌"> <el-form-item label="车牌">
<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input> <el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="车辆编码">
<el-input type="number" style="width: 200px;" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
</el-form-item>
<el-form-item label="用途"> <el-form-item label="用途">
<el-select class="filter-item" v-model="listQuery.useType" placeholder="请选择用途"> <el-select class="filter-item" v-model="listQuery.useType" placeholder="请选择用途">
<el-option :key="undefined" label="无" :value="undefined"></el-option> <el-option :key="undefined" label="无" :value="undefined"></el-option>
...@@ -473,6 +476,10 @@ ...@@ -473,6 +476,10 @@
} }
}, },
created() { created() {
const numberPlate = this.$route.query.numberPlate;
if (numberPlate) {
this.listQuery.numberPlate = numberPlate;
}
this.getList(); this.getList();
this.getAllVehicleType(); this.getAllVehicleType();
let currentMonth = getCurrentMonth(); let currentMonth = getCurrentMonth();
......
src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue
View file @ 73490ef7
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<div class="filter-container"> <div class="filter-container">
<el-input style="width: 200px;" placeholder="车牌号" <el-input style="width: 200px;" placeholder="车牌号"
v-model="listQuery.numberPlate"></el-input> v-model="listQuery.numberPlate"></el-input>
<el-input type="number" style="width: 200px;" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
<el-date-picker <el-date-picker
v-model="listQuery.selectedMonth" v-model="listQuery.selectedMonth"
type="month" type="month"
......
src/views/vehicle/vehicleUpkeepLog/index.vue
View file @ 73490ef7
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<div class="filter-container"> <div class="filter-container">
<el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号" <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号"
v-model="listQuery.numberPlate"></el-input> v-model="listQuery.numberPlate"></el-input>
<el-input type="number" style="width: 200px;" v-model.number="listQuery.code" class="filter-item" placeholder="请输入车辆编码"></el-input>
<el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button> <el-button class="filter-item" type="primary" v-waves icon="search" @click="handleFilter">搜索</el-button>
</div> </div>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
......
src/views/vehicleType/modal/oneType.vue
View file @ 73490ef7
This diff is collapsed.
src/views/xxOfficialWebsite/newsList.vue
View file @ 73490ef7
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination> layout="total, sizes, prev, pager, next, jumper" :total="total"></el-pagination>
</div> </div>
</div> </div>
<!-- 车型编辑 --> <!-- 文章编辑-->
<popup v-if="popupDialogVisible" :oneRow="oneRow" <popup v-if="popupDialogVisible" :oneRow="oneRow"
:popupTitle="modalTitle" v-on:oneDialogEvent="oneDialogEvent" :popupTitle="modalTitle" v-on:oneDialogEvent="oneDialogEvent"
></popup> ></popup>
......
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