Skip to content

S
SuperMan
Commit 5cfa9294 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents f85975c3 005eab05
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 261 additions and 219 deletions
src/components/SalesModule/addPassenger.vue
View file @ 5cfa9294
......@@ -802,14 +802,15 @@
jsGetAge(strBirthday){
let returnAge;
let strBirthdayArr=strBirthday.split("-");
let birthYear = strBirthdayArr[0];
let birthMonth = strBirthdayArr[1];
let birthDay = strBirthdayArr[2];
let birthYear = Number(strBirthdayArr[0]);
let birthMonth = Number(strBirthdayArr[1]);
let birthDay = Number(strBirthdayArr[2]);
let d = new Date();
let nowYear = d.getFullYear();
let nowMonth = d.getMonth() + 1;
let nowDay = d.getDate();
if(nowYear == birthYear && birthMonth <= nowMonth && birthDay <= nowDay){
console.log(birthYear)
if(nowYear === birthYear){
returnAge = 1;//同年 则为0岁
} else {
let ageDiff = nowYear - birthYear ; //年之差
......
src/components/busManagement/busUsePrice2.vue
View file @ 5cfa9294
<style>
.busUsePrice2 .busList {
.busUsePrice .busList {
width: 230px;
height: 270px;
float: left;
......@@ -10,27 +10,25 @@
overflow: hidden;
}
.busUsePrice2 .busListTable {
width: 98%;
margin: 0px 2px 0px 2px;
}
.busUsePrice2 .busListTable tr td {
.busUsePrice .busListTable{
width: 98%;
margin: 0px 2px 0px 2px;
}
.busUsePrice .busListTable tr td{
height: 20px;
line-height: 20px;
}
.busUsePrice2 .busListTop {
}
.busUsePrice .busListTop {
width: 100%;
position: relative;
text-align: center;
}
.busUsePrice2 .usePricediv {
.busUsePrice .usePricediv {
margin: 7px 0 0 20px;
}
.busUsePrice2 .btmAddStore {
.busUsePrice .btmAddStore {
border-top: 1px solid #d1d1d1;
width: 100%;
display: none;
......@@ -41,19 +39,19 @@
bottom: 0;
}
.busUsePrice2 .changeMsg {
.busUsePrice .changeMsg {
width: 80%;
}
.busUsePrice2 .changeMsg li {
.busUsePrice .changeMsg li {
float: left;
}
.busUsePrice2 .changeMsg li:first-child {
.busUsePrice .changeMsg li:first-child {
margin-left: 20px;
}
.busUsePrice2 .btmTitle {
.busUsePrice .btmTitle {
padding: 0 10px;
margin: 20px 0 20px 25px;
border-left: 3px solid #e95252;
......@@ -61,32 +59,32 @@
color: #000000;
}
.busUsePrice2 .busUsePeople .el-input__inner {
.busUsePrice .busUsePeople .el-input__inner {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.busUsePrice2 .busType {
.busUsePrice .busType {
margin: 10px 0 0 31px;
font-size: 14px;
display: inline-block;
}
.busUsePrice2 .cityBtnList {
.busUsePrice .cityBtnList {
margin: 10px 0 20px 20px;
}
.busUsePrice2 .busUserBtnList {
.busUsePrice .busUserBtnList {
width: 100%;
text-align: center;
margin-top: 10px;
}
.busUsePrice2 .busListTop img {
.busUsePrice .busListTop img {
width: 100%;
}
.busUsePrice2 .BusTypeStr {
.busUsePrice .BusTypeStr {
position: absolute;
top: 15px;
color: #fff;
......@@ -94,12 +92,12 @@
left: 63px;
}
.busUsePrice2 .UPBtn {
.busUsePrice .UPBtn {
width: 70px;
height: 23px;
}
.busUsePrice2 .topNotice {
.busUsePrice .topNotice {
width: 100%;
height: 20px;
font-size: 12px;
......@@ -107,27 +105,27 @@
margin: 20px 0;
}
.busUsePrice2 .delScien {
.busUsePrice .delScien {
position: absolute;
right: 10px;
top: 10px;
display: none;
}
.busUsePrice2 .delScien:hover {
.busUsePrice .delScien:hover {
color: #f76f6f;
cursor: pointer;
}
.busUsePrice2 .busList:hover .delScien {
.busUsePrice .busList:hover .delScien {
display: block;
}
.busUsePrice2 .busDiv {
.busUsePrice .busDiv {
margin-top: 20px;
}
.busUsePrice2 .busList:hover {
.busUsePrice .busList:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s;
}
......@@ -141,17 +139,13 @@
margin-left: 24px;
}
.busUsePrice2 .combottomDiv .el-select {
.busUsePrice .combottomDiv .el-select {
width: 100%;
}
.busUsePrice2 .linkStrle {
cursor: pointer;
text-decoration: underline;
color:blue;
}
</style>
<template>
<div class="flexOne busUsePrice2">
<div class="flexOne busUsePrice">
<div class="query-box">
<ul>
<li>
......@@ -163,97 +157,50 @@
</ul>
</div>
<div class="busDiv clearfix" v-loading="loading">
<table>
<thead>
<div class="busList" v-for="item in dataList" :key="item.subCode">
<div class="busListTop">
<img v-if="item.ShowBusImage" :src="item.ShowBusImage" style="width:230px;height:60px;" />
<img v-else src="../../assets/img/suplier.jpg" style="width:230px;height:60px;" />
<span class="BusTypeStr">{{item.BusTypeStr}}</span>
<div class="delScien" @click="isdelete(item.Id)">
<i class="iconfont icon-xingzhuang"></i>
</div>
</div>
<table class="busListTable">
<tr>
<th>
图片
</th>
<th>
地区/车辆类型
</th>
<th>
使用人数
</th>
<th>
接送价格
</th>
<th>
全天价格
</th>
<th>
半天价格
</th>
<th>
全天高速
</th>
<th>
接送高速
</th>
<th>
全天茶代
</th>
<th>
接送茶代
</th>
<th>
操作
</th>
<td style="width:49%;">使用人数：{{item.UseNum}}人</td>
<td style="width:49%;">地<span class="Bus_Spacing">区</span>：{{getArea(item.AreaType)}}</td>
</tr>
</thead>
<tbody v-for="item in dataList" :key="item.subCode">
<tr>
<td>
<img v-if="item.ShowBusImage" :src="item.ShowBusImage" style="width:230px;height:60px;" />
<img v-else src="../../assets/img/suplier.jpg" style="width:230px;height:60px;" />
</td>
<td>
{{getArea(item.AreaType)}}-{{item.BusTypeStr}}
</td>
<td>
{{item.UseNum}}
</td>
<td>
{{item.ReceivePrice}}
</td>
<td>
{{item.AllDayPrice}}
</td>
<td>
{{item.HalfDayPrice}}
</td>
<td>
{{item.AllDayHighSpeedFee}}
</td>
<td>
{{item.PickUpHighSpeedFee}}
</td>
<td>{{item.AllDayChaDaiFee}}</td>
<td>{{item.PickUpChaDaiFee}}</td>
<td rowspan="2">
<input type="button" class="normalBtn" @click="managePrice(item.Id)" value="管理报价" />&nbsp;
<a class="linkStrle" @click="goUrl('busUsePriceDetails',item.Id,'报价详情')">详情</a>&nbsp;
<a class="linkStrle" @click="isdelete(item.Id)">删除</a>
</td>
<td>接送报价：{{item.ReceivePrice}}</td>
<td>全天报价：{{item.AllDayPrice}}</td>
</tr>
<tr>
<td colspan="8">
备注: {{item.Remark}}
<td colspan="2">
半天报价：{{item.HalfDayPrice}}
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="9">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
</el-pagination>
</td>
<td>全天高速：{{item.AllDayHighSpeedFee}}</td>
<td>接送高速：{{item.PickUpHighSpeedFee}}</td>
</tr>
<tr>
<td>全天茶代：{{item.AllDayChaDaiFee}}</td>
<td>接送茶代：{{item.PickUpChaDaiFee}}</td>
</tr>
<tr>
<td colspan="2"><div style="height:40px; overflow-y:scroll">{{item.Remark}}</div></td>
</tr>
</tfoot>
</table>
</table>
<div class="busUserBtnList">
<input type="button" class="normalBtn" @click="managePrice(item.Id)" value="管理报价">
</div>
</div>
</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
</el-pagination>
<div class="combottomDiv" v-if="isShow">
<el-row>
<el-col :span="18">
......@@ -337,6 +284,7 @@
</el-input>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="币种" prop="CurrencyId">
<el-select filterable v-model='addMsg.CurrencyId' @change="getRate(addMsg.CurrencyId)">
......@@ -355,7 +303,7 @@
<el-form-item label="车辆图片">
<el-upload class="avatar-uploader" :http-request="UploadImage" :multiple="false"
accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<img v-if="addMsg.ShowBusImage&&addMsg.ShowBusImage!=''" :src="addMsg.ShowBusImage"
<img v-if="addMsg.ShowBusImage&&addMsg.ShowBusImage!=''" :src="addMsg.ShowBusImage"
style="width:200px;height:100px">
<i class="el-icon-upload2 avatar-uploader-icon"></i>
</el-upload>
......@@ -372,6 +320,7 @@
</div>
</div>
</template>
<script>
export default {
data() {
......@@ -495,16 +444,6 @@
};
},
methods: {
goUrl(path, id, name) {
this.$router.push({
name: path,
query: {
id: id,
blank: 'y',
tab: name
}
})
},
//上传图片
UploadImage(file) {
let newArr = [];
......@@ -590,6 +529,7 @@
}
}, err => {})
},
//修改管理报价
managePrice(ID) {
this.addMsg.ID = ID;
......
src/components/busManagement/busUsePriceDetails.vue
View file @ 5cfa9294
......@@ -148,20 +148,20 @@
</style>
<template>
<div class="flexOne busUsePrice">
<div class="query-box">
<div class="query-box" style="border-bottom:0;">
<ul>
<li>
注：以下报价是提供给开团人员产生成本报价的参考依据，不作为最终的用车价格
</li>
<li>
<input type="button" class="normalBtn" @click="addPanel" value="新增" />
</li>
</ul>
</div>
<div class="busDiv clearfix" v-loading="loading">
<table>
<table class="singeRowTable">
<thead>
<tr>
<th>
地区/车辆类型
</th>
<th>
时间
</th>
......@@ -193,6 +193,9 @@
</thead>
<tbody v-for="item in dataList" :key="item.subCode">
<tr>
<td>
{{item.AreaTypeStr}}-{{item.BusTypeStr}}
</td>
<td>
{{item.MonthStr}}
</td>
......@@ -214,14 +217,20 @@
<td>{{item.S_AllDayChaDaiFee}}</td>
<td>{{item.S_PickUpChaDaiFee}}</td>
<td>
<input type="button" class="normalBtn" @click="managePrice(item.Id)" value="管理报价">
<a @click="isdelete(item.Id)">删除</a>
<el-row>
<el-tooltip class="item" effect="dark" content="管理报价" placement="top-start">
<el-button type="primary" class="iconfont icon-bianji-smal" circle @click="managePrice(item.Id)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button type="danger" class="iconfont icon-img_delete_small" circle @click="isdelete(item.Id)"></el-button>
</el-tooltip>
</el-row>
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td colspan="9">
<td colspan="10">
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="msg.total">
</el-pagination>
......@@ -240,17 +249,17 @@
<input type="button" class="normalBtn" @click="submitForm('addMsg')" value="保存" />
</el-col>
</el-row>
<el-form :model="addMsg" ref="addMsg" label-width="100px">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-row>
<template v-if="addMsg.Id==0">
<el-col :span="5">
<el-form-item label="开始月份">
<el-form-item label="开始月份" prop="StartDateStr">
<el-date-picker v-model="addMsg.StartDateStr" type="month" value-format="yyyy-MM">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="结束月份">
<el-form-item label="结束月份" prop="EndDateStr">
<el-date-picker v-model="addMsg.EndDateStr" type="month" value-format="yyyy-MM">
</el-date-picker>
</el-form-item>
......@@ -339,6 +348,10 @@
S_PickUpHighSpeedFee: 0, //接送高速费
S_AllDayChaDaiFee: 0, //全天茶代费
S_PickUpChaDaiFee: 0, //接送茶代费
},
rules: {
StartDateStr: [{ required: true, message: "请选择开始月份", trigger: "change" }],
EndDateStr: [{ required: true, message: "请选择结束月份", trigger: "change" }],
}
};
},
......@@ -367,7 +380,6 @@
);
},
saveInfo() {
console.log("addMsg",this.addMsg);
this.apipost(
"buspricedetails_post_SetPriceDetails",
this.addMsg,
......
src/router/config.js
View file @ 5cfa9294
......@@ -1733,14 +1733,6 @@ export default {
title: '车辆报价'
},
},
{
path: '/busUsePrice2', //车辆报价2
name: 'busUsePrice2',
component: resolve => require(['@/components/busManagement/busUsePrice2'], resolve),
meta: {
title: '车辆报价'
},
},
{
path: '/busUsePriceDetails', //车辆报价详情
name: 'busUsePriceDetails',
......
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