Skip to content

S
SuperMan
Commit 89387018 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 825ef027
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 65 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 89387018
......@@ -175,14 +175,14 @@
<tr>
<td class="CP_ComTitle2 CostcomCenter" style="width:150px">酒店名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/间</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">车资/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">总车资</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:110px">餐厅名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:90px">价格/餐</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">景点名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格</td>
</tr>
<template v-for="(subItem,subIndex) in dayCostPrice">
<tr :key="subIndex+100000">
......@@ -427,14 +427,14 @@
</td>
<td>
{{getDayXiaoJi(1,1)}}(酒)+
{{ getDayXiaoJi(2,1)}}(车)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{getDayXiaoJi(9,1)}}(杂支)
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
</td>
<td>
{{getLocalJpyTotalMoney()}}
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="2">
{{getLocalTotalMoney()}}
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="4">
{{subItem.TotalMoney}}
......@@ -625,24 +625,30 @@
return parseFloat(value);
},
//获取地接项目(人民币)
getLocalTotalMoney() {
getLocalTotalMoney(PeopleNumber) {
let totalMoney = 0.0;
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
var hotelPrice = Number(this.getDayXiaoJi(1, 2)); //酒店费用
var sencePrice = Number(this.getDayXiaoJi(3, 2)); //景点费用
var canPrice = Number(this.getDayXiaoJi(4, 2)); //餐
var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)); //车费
var otherPrice = Number(this.getDayXiaoJi(9, 2)) / PeopleNumber; //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)) / PeopleNumber; //车费
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
//获取地接项目报价(日元)
getLocalJpyTotalMoney() {
getLocalJpyTotalMoney(PeopleNumber) {
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
let totalMoney = 0.0;
var busFee = Number(this.getDayXiaoJi(2, 1)) ;
var busFee = Number(this.getDayXiaoJi(2, 1)) / PeopleNumber;
var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用
var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用
var canPrice = Number(this.getDayXiaoJi(4, 1)); //早餐
var otherPrice = Number(this.getDayXiaoJi(9, 1)) ; //其它费用
var otherPrice = Number(this.getDayXiaoJi(9, 1)) / PeopleNumber; //其它费用
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @ 89387018
......@@ -82,14 +82,14 @@
<tr>
<td class="CP_ComTitle2 CostcomCenter" style="width:150px">酒店名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/间</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">车资/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">总车资</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">过路费</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:110px">餐厅名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:90px">价格/餐</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:100px">景点名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">名称</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格/人</td>
<td class="CP_ComTitle2 CostcomCenter" style="width:50px">价格</td>
</tr>
<template v-for="(subItem,subIndex) in dayCostPrice">
<tr :key="subIndex+100000">
......@@ -334,14 +334,14 @@
</td>
<td>
{{getDayXiaoJi(1,1)}}(酒)+
{{getDayXiaoJi(2,1)}}(车)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{getDayXiaoJi(9,1)}}(杂支)
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
</td>
<td>
{{getLocalJpyTotalMoney()}}
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="2">
{{getLocalTotalMoney()}}
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="4">
{{subItem.TotalMoney}}
......@@ -484,24 +484,30 @@
return parseFloat(value);
},
//获取地接项目(人民币)
getLocalTotalMoney() {
getLocalTotalMoney(PeopleNumber) {
let totalMoney = 0.0;
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
var hotelPrice = Number(this.getDayXiaoJi(1, 2)); //酒店费用
var sencePrice = Number(this.getDayXiaoJi(3, 2)); //景点费用
var canPrice = Number(this.getDayXiaoJi(4, 2)); //餐
var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)); //车费
var otherPrice = Number(this.getDayXiaoJi(9, 2)) / PeopleNumber; //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)) / PeopleNumber; //车费
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
//获取地接项目报价(日元)
getLocalJpyTotalMoney() {
getLocalJpyTotalMoney(PeopleNumber) {
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
let totalMoney = 0.0;
var busFee = Number(this.getDayXiaoJi(2, 1));
var busFee = Number(this.getDayXiaoJi(2, 1)) / PeopleNumber;
var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用
var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用
var canPrice = Number(this.getDayXiaoJi(4, 1)); //早餐
var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用
var otherPrice = Number(this.getDayXiaoJi(9, 1)) / PeopleNumber; //其它费用
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 89387018
......@@ -144,14 +144,14 @@
<tr>
<td style="width:150px" class="CP_ComTitle2 CostcomCenter">酒店名称</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/间</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">车资/人</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费/人</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">总车资</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">过路费<br />停车费</td>
<td style="width:110px" class="CP_ComTitle2 CostcomCenter">餐厅名称</td>
<td style="width:90px" class="CP_ComTitle2 CostcomCenter">价格/餐</td>
<td style="width:100px" class="CP_ComTitle2 CostcomCenter">景点名称</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">名称</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格/人</td>
<td style="width:50px" class="CP_ComTitle2 CostcomCenter">价格</td>
</tr>
<template v-for="(subItem,subIndex) in dayCostPrice">
<tr :key="subIndex">
......@@ -442,13 +442,14 @@
</td>
<td colspan="2">
{{getDayXiaoJi(1,1)}}(酒)+
{{getDayXiaoJi(2,1)}}(车)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)+{{(getDayXiaoJi(9,1))}}(杂支)
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
</td>
<td>
{{getLocalJpyTotalMoney()}}
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
</td>
<td>
{{getLocalTotalMoney()}}
{{getLocalTotalMoney(subItem.PeopleNumber)}}
</td>
<td colspan="4">
{{subItem.TotalMoney}}
......@@ -824,8 +825,8 @@
let that = this;
this.CostNumberList.forEach(x => {
//房餐车景点价格
var trip = Number(that.getLocalTotalMoney());
var jpyTrip = Number(that.getLocalJpyTotalMoney());
var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
var jpyTrip = Number(that.getLocalJpyTotalMoney(x.PeopleNumber));
//其他价格
var otherPrice = Number(that.getCostTotalMoney());
var jpyotherPrice = 0;
......@@ -841,24 +842,30 @@
return parseFloat(value);
},
//获取地接项目(人民币)
getLocalTotalMoney() {
getLocalTotalMoney(PeopleNumber) {
let totalMoney = 0.0;
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
var hotelPrice = Number(this.getDayXiaoJi(1, 2)); //酒店费用
var sencePrice = Number(this.getDayXiaoJi(3, 2)); //景点费用
var canPrice = Number(this.getDayXiaoJi(4, 2)); //餐
var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)); //车费
var otherPrice = Number(this.getDayXiaoJi(9, 2)) / PeopleNumber; //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)) / PeopleNumber; //车费
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
//获取地接项目报价(日元)
getLocalJpyTotalMoney() {
getLocalJpyTotalMoney(PeopleNumber) {
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
let totalMoney = 0.0;
var busFee = Number(this.getDayXiaoJi(2, 1));
var busFee = Number(this.getDayXiaoJi(2, 1)) / PeopleNumber;
var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用
var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用
var canPrice = Number(this.getDayXiaoJi(4, 1)); //早餐
var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用
var otherPrice = Number(this.getDayXiaoJi(9, 1)) / PeopleNumber; //其它费用
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 89387018
......@@ -349,27 +349,22 @@
<!-- 下载弹窗 -->
<el-dialog custom-class="w600" title="导入报价单" :visible.sync="isShowImportOffer" center>
<div class="BilldownLoadCommon">
<el-form>
<table style="width:590px;" border="0" cellspacing="0" cellpadding="0">
<tr>
<th colspan="2" style="height:50px;">
报价单导入
</th>
</tr>
<el-form label-width="80px">
<table style="width:580px;" border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td>
<el-form-item label="出团类型" label-width="120">
<el-form-item label="出团类型">
<el-select v-model="postConfig.TeamType" @change="postConfig.LineId=0,postConfig.LineteamId=0"
style="width:200px">
style="width:180px">
<el-option v-for='item in teamList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
</td>
<td>
<el-form-item label="线路" label-width="120">
<el-select v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')" style="width:200px"
<el-form-item label="线路">
<el-select v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')" style="width:180px"
@change="changeLine()" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in getLineList" :label='item.LineName' :value='item.LineID'
......@@ -381,8 +376,8 @@
</tr>
<tr>
<td>
<el-form-item label="系列" label-width="120">
<el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" style="width:200px"
<el-form-item label="系列">
<el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" style="width:180px"
filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
......@@ -391,8 +386,8 @@
</el-form-item>
</td>
<td>
<el-form-item label="出团公司" label-width="120">
<el-select class="multiple_input" v-model="postConfig.OutBranchId" filterable style="width:200px">
<el-form-item label="出团公司">
<el-select class="multiple_input" v-model="postConfig.OutBranchId" filterable style="width:180px">
<el-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option>
</el-select>
......@@ -401,24 +396,24 @@
</tr>
<tr>
<td>
<el-form-item label="出发时间" label-width="120">
<el-form-item label="出发时间">
<el-date-picker type="date" v-model="postConfig.OutDateTime" value-format="yyyy-MM-dd" placeholder
style="width:200px">
style="width:180px">
</el-date-picker>
</el-form-item>
</td>
<td>
<el-form-item label="客户名称" label-width="120">
<el-form-item label="客户名称">
<el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200"
style="width:200px">
style="width:180px">
</el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<td colspan="2">
<el-upload class="upload-demo" action="" accept="*.*" :http-request="UploadAttachment"
:show-file-list="false">
:show-file-list="true">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传.xls/.xlsx文件</div>
</el-upload>
......@@ -427,8 +422,7 @@
</tbody>
<tr height="66">
<td colspan="2" style="text-align:center;">
<input type="button" class="normalBtn" style="margin-left:-70px;" :value="$t('pub.sureBtn')"
@click="ImportOffer()" />
<input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="ImportOffer()" />
</td>
</tr>
</table>
......@@ -499,6 +493,7 @@
OutBranchId: 0, //出团公司
OutDateTime: "", //出团时间
CustomerName: "", //客户名称
EmployeeId: 0,
},
myfile: "",
};
......@@ -537,11 +532,22 @@
ShowImportOffer() {
this.isShowImportOffer = true;
},
//情况导入数据
clearMsg() {
this.postConfig.TeamType = 0;
this.postConfig.LineId = 0;
this.postConfig.LineteamId = 0;
this.postConfig.OutBranchId = 0;
this.postConfig.OutDateTime = "";
this.postConfig.CustomerName = "";
this.postConfig.EmployeeId = 0;
},
//导入报价单
ImportOffer() {
let urlObj = this.domainManager();
var formData = new FormData();
formData.append("myfile", this.myfile);
this.postConfig.EmployeeId = this.getLocalStorage().EmployeeId;
formData.append("msg", JSON.stringify(this.postConfig));
// 'Content-Type': 'multipart/form-data'
this.$http({
......@@ -553,8 +559,9 @@
data: formData
}).then(res => {
console.log("ImportOffer", res);
if (res.data.resultCode === 1) {
if (res.status === 200) {
this.clearMsg();
this.isShowImportOffer = false;
} else {
this.$message.error('上传失败!');
}
......
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