Skip to content

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

页面修改

parent f0416106
Show whitespace changes
Inline Side-by-side
Showing with 243 additions and 76 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 4c6df33a
......@@ -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)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
{{ getDayXiaoJi(2,1)}}(车)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{getDayXiaoJi(9,1)}}(杂支)
</td>
<td>
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
{{getLocalJpyTotalMoney()}}
</td>
<td colspan="2">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
{{getLocalTotalMoney()}}
</td>
<td colspan="4">
{{subItem.TotalMoney}}
......@@ -625,30 +625,24 @@
return parseFloat(value);
},
//获取地接项目(人民币)
getLocalTotalMoney(PeopleNumber) {
getLocalTotalMoney() {
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)) / PeopleNumber; //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)) / PeopleNumber; //车费
var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)); //车费
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
//获取地接项目报价(日元)
getLocalJpyTotalMoney(PeopleNumber) {
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
getLocalJpyTotalMoney() {
let totalMoney = 0.0;
var busFee = Number(this.getDayXiaoJi(2, 1)) / PeopleNumber;
var busFee = Number(this.getDayXiaoJi(2, 1)) ;
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)) / PeopleNumber; //其它费用
var otherPrice = Number(this.getDayXiaoJi(9, 1)) ; //其它费用
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue
View file @ 4c6df33a
......@@ -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)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
{{getDayXiaoJi(2,1)}}(车)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{getDayXiaoJi(9,1)}}(杂支)
</td>
<td>
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
{{getLocalJpyTotalMoney()}}
</td>
<td colspan="2">
{{getLocalTotalMoney(subItem.PeopleNumber)}}
{{getLocalTotalMoney()}}
</td>
<td colspan="4">
{{subItem.TotalMoney}}
......@@ -484,30 +484,24 @@
return parseFloat(value);
},
//获取地接项目(人民币)
getLocalTotalMoney(PeopleNumber) {
getLocalTotalMoney() {
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)) / PeopleNumber; //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)) / PeopleNumber; //车费
var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)); //车费
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
//获取地接项目报价(日元)
getLocalJpyTotalMoney(PeopleNumber) {
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
getLocalJpyTotalMoney() {
let totalMoney = 0.0;
var busFee = Number(this.getDayXiaoJi(2, 1)) / PeopleNumber;
var busFee = Number(this.getDayXiaoJi(2, 1));
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)) / PeopleNumber; //其它费用
var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 4c6df33a
......@@ -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,14 +442,13 @@
</td>
<td colspan="2">
{{getDayXiaoJi(1,1)}}(酒)+
{{ (getDayXiaoJi(2,1)/subItem.PeopleNumber).toFixed(2)}}(车=总车资/人数)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)
+{{(getDayXiaoJi(9,1)/subItem.PeopleNumber).toFixed(2)}}(杂支=总杂支/人数)
{{getDayXiaoJi(2,1)}}(车)+{{getDayXiaoJi(4,1)}}(餐)+{{getDayXiaoJi(3,1)}}(门票)+{{(getDayXiaoJi(9,1))}}(杂支)
</td>
<td>
{{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
{{getLocalJpyTotalMoney()}}
</td>
<td>
{{getLocalTotalMoney(subItem.PeopleNumber)}}
{{getLocalTotalMoney()}}
</td>
<td colspan="4">
{{subItem.TotalMoney}}
......@@ -825,8 +824,8 @@
let that = this;
this.CostNumberList.forEach(x => {
//房餐车景点价格
var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
var jpyTrip = Number(that.getLocalJpyTotalMoney(x.PeopleNumber));
var trip = Number(that.getLocalTotalMoney());
var jpyTrip = Number(that.getLocalJpyTotalMoney());
//其他价格
var otherPrice = Number(that.getCostTotalMoney());
var jpyotherPrice = 0;
......@@ -842,30 +841,24 @@
return parseFloat(value);
},
//获取地接项目(人民币)
getLocalTotalMoney(PeopleNumber) {
getLocalTotalMoney() {
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)) / PeopleNumber; //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)) / PeopleNumber; //车费
var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
var busFee = Number(this.getDayXiaoJi(2, 2)); //车费
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
//获取地接项目报价(日元)
getLocalJpyTotalMoney(PeopleNumber) {
if (PeopleNumber <= 0) {
PeopleNumber = 1;
}
getLocalJpyTotalMoney() {
let totalMoney = 0.0;
var busFee = Number(this.getDayXiaoJi(2, 1)) / PeopleNumber;
var busFee = Number(this.getDayXiaoJi(2, 1));
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)) / PeopleNumber; //其它费用
var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用
totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
return totalMoney.toFixed(2);
},
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceMun.vue
View file @ 4c6df33a
......@@ -218,7 +218,7 @@
LineTeamList: [], //系列下拉列表
companyList: [], //出团公司
teamList: [],
teamList: [],//团队类型
payTypeList: [{
value: 1,
label: '现金'
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 4c6df33a
......@@ -68,7 +68,7 @@
<span>
<em>所属线路</em>
<el-select v-model="queryData.LineId" class='w200' filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()">
@change="getLineTeamList(queryData.LineId)">
<el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option>
......@@ -110,6 +110,7 @@
<li>
<button class="hollowFixedBtn" @click="getList(),resetPageIndex()">查询</button>
<button class="hollowFixedBtn" @click="goMakeQuo('QuotationNewPrice',0)">新增</button>
<button class="hollowFixedBtn" @click="ShowImportOffer()" style="display:none;">导入报价单</button>
</li>
</ul>
</div>
......@@ -274,7 +275,7 @@
</el-tooltip>
</span>
<span style="background:#85ce61; " class="newAopbdd">
<el-tooltip class="item" effect="dark" content="查看" placement="top-start" popper-class="max-w250">
<el-tooltip class="item" effect="dark" w450content="查看" placement="top-start" popper-class="max-w250">
<i @click="goUrl('QuotationAduit',item.ID,1)" class="iconfont icon-view"></i>"></i>
</el-tooltip>
</span>
......@@ -344,6 +345,96 @@
</table>
</div>
</el-dialog>
<!-- 下载弹窗 -->
<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>
<tbody>
<tr>
<td>
<el-form-item label="出团类型" label-width="120">
<el-select v-model="postConfig.TeamType" @change="postConfig.LineId=0,postConfig.LineteamId=0"
style="width:200px">
<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"
@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'
:key='item.LineID'>
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="系列" label-width="120">
<el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" style="width:200px"
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'>
</el-option>
</el-select>
</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-option v-for='item in companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item label="出发时间" label-width="120">
<el-date-picker type="date" v-model="postConfig.OutDateTime" value-format="yyyy-MM-dd" placeholder
style="width:200px">
</el-date-picker>
</el-form-item>
</td>
<td>
<el-form-item label="客户名称" label-width="120">
<el-input v-model="postConfig.CustomerName" type="text" placeholder="客户名称" maxlength="200"
style="width:200px">
</el-input>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-upload class="upload-demo" action="" accept="*.*" :http-request="UploadAttachment"
:show-file-list="false">
<el-button size="small" type="primary">点击上传</el-button>
<div slot="tip" class="el-upload__tip">只能上传.xls/.xlsx文件</div>
</el-upload>
</td>
</tr>
</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()" />
</td>
</tr>
</table>
</el-form>
</div>
</el-dialog>
</div>
</template>
<script>
......@@ -375,15 +466,16 @@
label: "未开团"
}
],
//线路列表
LineList: "",
noLimit: 0,
//系列列表
LineTeamList: "",
LineList: [], //线路列表
LineTeamList: [], //系列下拉列表
companyList: [], //出团公司
teamList: [], //团队类型
//是否有数据
noData: false,
dataList: "",
downloadBill: false,
isShowImportOffer: false, //是否显示导入报价单
//下载参数
downLoadMsg: {
ID: 0,
......@@ -399,9 +491,75 @@
IsShowOtherPrice: false, //其他定价
IsCostRebate: false, //成本回扣
},
//报价单导入参数
postConfig: {
TeamType: 0, //团队类型
LineId: 0, //线路编号
LineteamId: 0, //系列编号
OutBranchId: 0, //出团公司
OutDateTime: "", //出团时间
CustomerName: "", //客户名称
},
myfile: "",
};
},
computed: {
//线路筛选
getLineList() {
var chooseLineList = [];
//散拼
if (this.postConfig.TeamType == 0) {
chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 2);
} //小包团
else if (this.postConfig.TeamType == 1) {
chooseLineList = this.LineList.filter(qItem => qItem.Is_PacketGroup == 1);
}
//当地游
else if (this.postConfig.TeamType == 2) {
chooseLineList = this.LineList.filter(qItem => qItem.LineDirection == 3);
}
return chooseLineList;
},
},
methods: {
UploadAttachment(files) {
this.myfile = files.file
},
//线路切换
changeLine() {
var line = this.LineList.find(xItem => xItem.LineID == this.postConfig.LineId);
this.postConfig.IsDirect = 0;
if (line) {
this.postConfig.IsDirect = line.IsDirect;
}
this.getLineTeamList(this.postConfig.LineId, 1);
},
ShowImportOffer() {
this.isShowImportOffer = true;
},
//导入报价单
ImportOffer() {
let urlObj = this.domainManager();
var formData = new FormData();
formData.append("myfile", this.myfile);
formData.append("msg", JSON.stringify(this.postConfig));
// 'Content-Type': 'multipart/form-data'
this.$http({
headers: {
'Content-Type': 'multipart/form-data'
},
method: 'post',
url: urlObj.DomainUrl + '/api/file/UploadFile',
data: formData
}).then(res => {
console.log("ImportOffer", res);
if (res.data.resultCode === 1) {
} else {
this.$message.error('上传失败!');
}
}).catch(err => {})
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage();
......@@ -447,19 +605,36 @@
this.queryData.PageIndex = 1;
this.queryData.currentPage = 1;
},
//获取线路列表
getLineList() {
this.apipost("line_post_GetList", {}, res => {
getCompanyList() {
//出团公司
this.apipost(
"sellorder_post_GetBranchList", {},
res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
this.companyList = res.data.data;
}
});
}
);
},
//获取团队类型
getTeamList() {
//出团公司
this.apipost(
"travel_GetTeamTypeEnumList", {},
res => {
if (res.data.resultCode == 1) {
this.teamList = res.data.data;
}
}
);
},
//获取系列列表
getLineTeamList() {
this.queryData.LineteamId = 0;
getLineTeamList(lineId, isClear) {
if (isClear && isClear == 1) {
this.postConfig.LineteamId = 0;
}
let msg = {
lineID: this.queryData.LineId,
lineID: lineId,
isTOOP: 1
};
this.apipost("team_post_GetList", msg, res => {
......@@ -577,14 +752,25 @@
this.loading = false;
});
},
//获取线路列表
queryLineList() {
this.apipost("line_post_GetList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
});
},
},
mounted() {
this.getList();
},
created() {
this.userInfo = this.getLocalStorage();
this.getCompanyList();
this.getEmployeeList();
this.getLineList();
this.queryLineList();
this.getTeamList();
this.getLineTeamList();
}
};
......
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