Skip to content

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

页面修改

parent 9ecd3a57
Hide whitespace changes
Inline Side-by-side
Showing with 120 additions and 34 deletions
src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue
View file @ 71ff59b8
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
{{OtherPrice.AirTicketMoeny}} {{OtherPrice.AirTicketMoeny}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td>
<el-form-item label="中段机票"> <el-form-item label="中段机票">
{{OtherPrice.InlandAirTicketMoney}} {{OtherPrice.InlandAirTicketMoney}}
</el-form-item> </el-form-item>
...@@ -324,7 +324,7 @@ ...@@ -324,7 +324,7 @@
{{teamPrice.UnionPrice}} {{teamPrice.UnionPrice}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="5" rowspan="2"> <td colspan="6" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险): 小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
<br />{{getCostTotalMoney()}} <br />{{getCostTotalMoney()}}
</td> </td>
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
{{OtherPrice.AirTicketShareMoney}} {{OtherPrice.AirTicketShareMoney}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td>
<el-form-item label="过夜"> <el-form-item label="过夜">
{{teamPrice.NightPrice}} {{teamPrice.NightPrice}}
</el-form-item> </el-form-item>
...@@ -366,13 +366,14 @@ ...@@ -366,13 +366,14 @@
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item label="儿童占床"> <el-form-item label="儿童不占床">
{{teamPrice.ChildNeedPrice}} {{teamPrice.ChildNoNeedPrice}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item label="儿童不占床"> <el-form-item label="儿童占床">
{{teamPrice.ChildNoNeedPrice}} {{teamPrice.ChildNeedPrice}}
</el-form-item> </el-form-item>
</td> </td>
<td colspan="6"> <td colspan="6">
...@@ -382,6 +383,18 @@ ...@@ -382,6 +383,18 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2">
<el-form-item label="主OP">
{{postConfig.OPName}}
</el-form-item>
</td>
<td colspan="3">
<el-form-item label="助理OP：">
<template v-if="postConfig.Assistantlist&&postConfig.Assistantlist.length>0">
<span v-for="(subItem,subIndex) in postConfig.Assistantlist" :key="subIndex" style="padding-left:3px;">{{subItem.Name}}</span>
</template>
</el-form-item>
</td>
<td colspan="2"> <td colspan="2">
<el-form-item label="付款方式"> <el-form-item label="付款方式">
<template v-if="postConfig.SaleOfferPayType==1"> <template v-if="postConfig.SaleOfferPayType==1">
...@@ -395,7 +408,7 @@ ...@@ -395,7 +408,7 @@
</template> </template>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="11"> <td colspan="6">
附件: <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0"> 附件: <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
<template v-for="(subItem,subIndex) in teamPrice.ContractArray"> <template v-for="(subItem,subIndex) in teamPrice.ContractArray">
<a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex" <a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"
......
src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue
View file @ 71ff59b8
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
@keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td>
<el-form-item label="中段机票"> <el-form-item label="中段机票">
<el-input type="text" v-model='OtherPrice.InlandAirTicketMoney' class="w100" <el-input type="text" v-model='OtherPrice.InlandAirTicketMoney' class="w100"
@keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
@keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input> @keyup.native="checkPrice(teamPrice,'UnionPrice'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="5" rowspan="2"> <td colspan="6" rowspan="2">
小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险): 小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
<br /> {{getCostTotalMoney()}} <br /> {{getCostTotalMoney()}}
</td> </td>
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
@keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input> @keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td>
<el-form-item label="过夜"> <el-form-item label="过夜">
<el-input type="text" v-model='teamPrice.NightPrice' class="w100" <el-input type="text" v-model='teamPrice.NightPrice' class="w100"
@keyup.native="checkPrice(teamPrice,'NightPrice'),getchange()"></el-input> @keyup.native="checkPrice(teamPrice,'NightPrice'),getchange()"></el-input>
...@@ -375,16 +375,16 @@ ...@@ -375,16 +375,16 @@
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item label="儿童占床"> <el-form-item label="儿童不占床">
<el-input placeholder="" v-model="teamPrice.ChildNeedPrice" <el-input placeholder="" v-model="teamPrice.ChildNoNeedPrice"
@keyup.native="checkInteger(teamPrice,'ChildNeedPrice')" class="w70"> @keyup.native="checkInteger(teamPrice,'ChildNoNeedPrice')" class="w70">
</el-input> </el-input>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="2"> <td colspan="2">
<el-form-item label="儿童不占床"> <el-form-item label="儿童占床">
<el-input placeholder="" v-model="teamPrice.ChildNoNeedPrice" <el-input placeholder="" v-model="teamPrice.ChildNeedPrice"
@keyup.native="checkInteger(teamPrice,'ChildNoNeedPrice')" class="w70"> @keyup.native="checkInteger(teamPrice,'ChildNeedPrice')" class="w70">
</el-input> </el-input>
</el-form-item> </el-form-item>
</td> </td>
...@@ -397,9 +397,31 @@ ...@@ -397,9 +397,31 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2">
<el-form-item label="主OP">
<el-select class="w100" v-model="postConfig.OPId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(item,index) in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="index">
</el-option>
</el-select>
</el-form-item>
<span style="color:red">关联提成,请正确填写</span>
</td>
<td colspan="3">
<el-form-item label="助理OP">
<el-select class="w250" v-model="postConfig.Assistantlist" :placeholder="$t('pub.pleaseSel')"
filterable multiple>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="(item,index) in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="index"></el-option>
</el-select>
</el-form-item>
<span style="color:red">关联提成,请正确填写</span>
</td>
<td colspan="2"> <td colspan="2">
<el-form-item label="付款方式"> <el-form-item label="付款方式">
<el-select sclass="w70" v-model="postConfig.SaleOfferPayType" :placeholder="$t('pub.pleaseSel')" <el-select class="w70" v-model="postConfig.SaleOfferPayType" :placeholder="$t('pub.pleaseSel')"
filterable> filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option v-for="item in payTypeList" :label='item.label' :value='item.value' :key='item.value'> <el-option v-for="item in payTypeList" :label='item.label' :value='item.value' :key='item.value'>
...@@ -407,7 +429,7 @@ ...@@ -407,7 +429,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</td> </td>
<td colspan="11"> <td colspan="6">
附件: <el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo" 附件: <el-upload v-if="!teamPrice.ContractArray || !teamPrice.ContractArray.length" class="upload-demo"
style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn" style="display:inline-block;position:relative;top:-1px;left:3px;" :http-request="uploadFileBtn"
:show-file-list="false" action=""> :show-file-list="false" action="">
...@@ -423,6 +445,9 @@ ...@@ -423,6 +445,9 @@
</template> </template>
</td> </td>
</tr> </tr>
<tr>
<td colspan="13"></td>
</tr>
<tfoot> <tfoot>
<tr> <tr>
<td> <td>
...@@ -549,7 +574,8 @@ ...@@ -549,7 +574,8 @@
label: '外站自理' label: '外站自理'
}, ], }, ],
HotelName: null, //酒店下拉 HotelName: null, //酒店下拉
loading: false loading: false,
EmployeeList: [], //员工列表
} }
}, },
methods: { methods: {
...@@ -940,7 +966,26 @@ ...@@ -940,7 +966,26 @@
}, },
getchange() { getchange() {
this.getSubtotalMoney(); this.getSubtotalMoney();
} },
//员工列表
getEmployeeList() {
let userInfo = this.getLocalStorage();
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: "-1",
DepartmentId: "-1",
PostId: "-1",
IsLeave: "0"
};
this.apipost(
"admin_get_EmployeeGetList", msg,
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}
);
},
}, },
mounted() { mounted() {
this.IsDefault = this.queryMsg.IsDefault this.IsDefault = this.queryMsg.IsDefault
...@@ -949,7 +994,7 @@ ...@@ -949,7 +994,7 @@
this.getAllCurrency(); this.getAllCurrency();
}, },
created() { created() {
this.getEmployeeList();
}, },
watch: { watch: {
postConfig: { postConfig: {
......
src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue
View file @ 71ff59b8
...@@ -73,6 +73,8 @@ ...@@ -73,6 +73,8 @@
ManagerAduitDate: "", //欧洲线审核日期 ManagerAduitDate: "", //欧洲线审核日期
ManagerAduitName: "", //欧洲线审核人员 ManagerAduitName: "", //欧洲线审核人员
ManagerAduitStatus: 0, //欧洲线审核状态(1-通过，2-驳回) ManagerAduitStatus: 0, //欧洲线审核状态(1-通过，2-驳回)
OPName: "", //主OP
AssistantList: [], //助理OP
}, },
dayCostPriceList: [], //报价列表 dayCostPriceList: [], //报价列表
isSubmit: true, isSubmit: true,
...@@ -258,6 +260,12 @@ ...@@ -258,6 +260,12 @@
if (offerObj.ManagerAduitStatus) { if (offerObj.ManagerAduitStatus) {
this.postData.ManagerAduitStatus = offerObj.ManagerAduitStatus; this.postData.ManagerAduitStatus = offerObj.ManagerAduitStatus;
} }
if (offerObj.OPName && offerObj.OPName != '') {
this.postData.OPName = offerObj.OPName;
}
if (offerObj.AssistantList && offerObj.AssistantList.length > 0) {
this.postData.Assistantlist = offerObj.AssistantList;
}
} }
} }
this.postData.CustomerName = tempData.CustomerName; this.postData.CustomerName = tempData.CustomerName;
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 71ff59b8
...@@ -62,6 +62,9 @@ ...@@ -62,6 +62,9 @@
OutDateTime: "", //出发时间 OutDateTime: "", //出发时间
OfferPayType: 0, //报价单付款方式 OfferPayType: 0, //报价单付款方式
SaleOfferPayType: 0, //售价付款方式 SaleOfferPayType: 0, //售价付款方式
OPId: "", //主OP
AssistantId: "", //助理OP[格式:1,2,3]
Assistantlist: [], //助理OP数组
}, },
dayCostPriceList: [], //报价列表 dayCostPriceList: [], //报价列表
isSubmit: true, isSubmit: true,
...@@ -175,17 +178,23 @@ ...@@ -175,17 +178,23 @@
this.$message.error('请选择线路') this.$message.error('请选择线路')
return return
} }
this.postData.AssistantId = "";
if (this.postData.Assistantlist && this.postData.Assistantlist.length > 0) {
this.postData.AssistantId = this.postData.Assistantlist.join(',');
}
data.forEach(item => { data.forEach(item => {
item.IsDefault = item.queryMsg.IsDefault ? 1 : 0 item.IsDefault = item.queryMsg.IsDefault ? 1 : 0;
item.otherPrice = item.OtherPrice item.otherPrice = item.OtherPrice;
item.dayCostPriceList = item.dayCostPrice item.dayCostPriceList = item.dayCostPrice;
item.CurrencyNumberListExt = getCostCurrency(item.CurrencyNumberListExt) item.CurrencyNumberListExt = getCostCurrency(item.CurrencyNumberListExt);
item.currencyNumberList = item.CostCurrencyList item.currencyNumberList = item.CostCurrencyList;
item.OtherPrice.CurrencyNumberList = item.CostCurrencyList item.OtherPrice.CurrencyNumberList = item.CostCurrencyList;
item.TeamType = this.postData.TeamType item.TeamType = this.postData.TeamType;
item.OutBranchId = this.postData.OutBranchId item.OutBranchId = this.postData.OutBranchId;
item.TravelState = this.postData.TravelState item.TravelState = this.postData.TravelState;
item.OutDateTime = this.postData.OutDateTime item.OutDateTime = this.postData.OutDateTime;
item.OPId = this.postData.OPId;
item.AssistantId = this.postData.AssistantId;
}) })
var nObj = { var nObj = {
config: this.postData, config: this.postData,
...@@ -279,12 +288,23 @@ ...@@ -279,12 +288,23 @@
if (tempData.OutBranchName && tempData.OutBranchName != '') { if (tempData.OutBranchName && tempData.OutBranchName != '') {
this.postData.OutBranchId = Number(tempData.OutBranchId); this.postData.OutBranchId = Number(tempData.OutBranchId);
} }
this.postData.TeamType=tempData.TeamType; this.postData.TeamType = tempData.TeamType;
this.postData.OfferPayType = tempData.OfferPayType; this.postData.OfferPayType = tempData.OfferPayType;
this.postData.SaleOfferPayType = tempData.SaleOfferPayType; this.postData.SaleOfferPayType = tempData.SaleOfferPayType;
this.postData.TravelState = tempData.TravelState; this.postData.TravelState = tempData.TravelState;
this.LineList = tempData.LineList; this.LineList = tempData.LineList;
if (tempData.OfferArray) { if (tempData.OfferArray && tempData.OfferArray.length > 0) {
var offerObj = tempData.OfferArray[0];
if (offerObj && offerObj.OPName && offerObj.OPName != '') {
this.postData.OPId = offerObj.OPId;
}
if (offerObj && offerObj.AssistantList && offerObj.AssistantList.length > 0) {
var tempArray = [];
offerObj.AssistantList.forEach(subItem => {
tempArray.push(subItem.Id)
});
this.postData.Assistantlist = tempArray;
}
tempData.OfferArray.forEach(item => { tempData.OfferArray.forEach(item => {
this.OfferArray.push(item) this.OfferArray.push(item)
}) })
......
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