Skip to content

S
SuperMan
Commit 72824603 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents bc543e05 bb2ce689
Expand all Show whitespace changes
Inline Side-by-side
Showing with 355 additions and 179 deletions
src/components/FinancialModule/OPRules.vue
View file @ 72824603
......@@ -107,11 +107,11 @@
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
</el-select>
</el-form-item>
<el-form-item label="系列" v-show="form.LineIdList.length==1 && form.LineIdList[0]!=-1">
<!-- <el-form-item label="系列" v-show="form.LineIdList.length==1 && form.LineIdList[0]!=-1">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LtIdList" >
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="描述">
<el-input class="w220" v-model="form.Description"></el-input>
</el-form-item>
......@@ -236,6 +236,7 @@ export default {
this.getLineList();
this.getList();
this.getEmployeeList();
this.getDepartment();
},
methods:{
......@@ -294,7 +295,7 @@ export default {
FInternMoney:item.FInternMoney,
}
this.departmentMsg.RB_Branch_Id=item.BranchId;
this.getDepartment();
this.getLineTeamList();
},
RulesOk(formName){
......@@ -307,10 +308,10 @@ export default {
this.Error("请选择分负责OP！")
return;
}
if(this.form.FZLEmployeeIdList.length==0){
this.Error("请选择分助理！")
return;
}
// if(this.form.FZLEmployeeIdList.length==0){
// this.Error("请选择分助理！")
// return;
// }
if(this.form.FInternMoney==0){
this.Error("请填写分负责人金额！")
return;
......@@ -415,9 +416,9 @@ export default {
linkageDepartment(val){
this.departmentMsg.RB_Branch_Id=this.form.BranchId;
this.departmentList=[];
// this.departmentList=[];
this.form.DepartmentId=-1;
this.getDepartment();
// this.getDepartment();
if(this.departmentMsg.RB_Branch_Id==0){
this.stateShow=false;
......@@ -432,12 +433,13 @@ export default {
},
getDepart(id){
this.form.DepartmentId= id;
this.$forceUpdate();
// this.$forceUpdate();
},
getDepartment() {
this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
if(res.data.resultCode == 1) {
this.departmentList = res.data.data;
console.log("this.departmentList",this.departmentList)
}
}, err => {})
},
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 72824603
......@@ -423,6 +423,7 @@
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span>
<span v-else-if="subItem.PayStyle === 10">领队导游垫付</span>
<span v-else></span>
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
......
src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue
View file @ 72824603
......@@ -107,14 +107,14 @@
</style>
<template>
<div class="DirectQuotation clearfix">
<div class="DirectNewQuotation clearfix">
<el-form label-width="100px" ref="currentOfferFrom">
<div class="switchDiv clearfix" style="width:98%;">
<div class="DirectPriceCenter">
<div class="singlePrice clearfix">
<CostPrice ref="CostPrice" :postConfig="postConfig" :OtherPrice="otherPrice"
:dayCostPrice="dayCostPrice" :LineList="LineList"></CostPrice>
<CostNewPrice ref="CostNewPrice" :postConfig="postConfig" :OtherPrice="otherPrice"
:dayCostPrice="dayCostPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList" :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"></CostNewPrice>
</div>
</div>
<div class="DirectRightPrice" style="margin-left:20px;">
......@@ -270,10 +270,10 @@
</div>
</template>
<script>
import CostPrice from "../TravelNewQuotation/CostNewPrice";
import CostNewPrice from "../TravelNewQuotation/CostNewPrice";
export default {
props: ["postConfig", "dayCostPrice", "otherPrice", "teamPrice","LineList"],
props: ["postConfig", "dayCostPrice", "otherPrice", "teamPrice","LineList","CostCurrencyList","CostNumberList","CurrencyNumberListExt"],
data() {
return {
CheckedVaule: 2,
......@@ -287,7 +287,7 @@
},
components: {
CostPrice: CostPrice
CostNewPrice: CostNewPrice
}
};
......
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ 72824603
<template>
<div class="DirectQuotation clearfix">
<DirectQuotation ref="QuotationPrice" :postConfig="postData" :dayCostPrice="dayCostPriceList"
:otherPrice="otherPrice" :teamPrice="teamPrice" :LineList="LineList"></DirectQuotation>
:otherPrice="otherPrice" :teamPrice="teamPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
:CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"></DirectQuotation>
<div class="btnFixedDiv">
<div class="toTop">
<i class="iconfont icon-huidaodingbu"></i>
......@@ -21,6 +22,7 @@
export default {
data() {
return {
ConfigID: 0,
//基本配置
postData: {
ID: 0,
......@@ -32,11 +34,11 @@
IsSubstitution: 1,
IsB2B: 1,
IsB2C: 1,
FSeat: "",
CSeat: "",
YSeat: "",
FSeat: 0,
CSeat: 0,
YSeat: 0,
//最低成团人数
LowNum: "",
LowNum: 0,
//OP备注
OpRemark: "",
//产品经理备注
......@@ -45,13 +47,13 @@
PriceIsDirect: 1, //是否直采报价（1-否-2-是）【全部默认非直采】
PDFAlias: "", //pdf别名
ImgCover: "", //封面图
DayNum: "", //天数
NightNum: "", //晚数
DayNum: 0, //天数
NightNum: 0, //晚数
StartCityId: 0,
ReturnArriveCityId: 0, //返回抵达城市
},
dayCostPriceList: [], //报价列表
isSubmit:false,
isSubmit: true,
otherPrice: {
CostId: 0, //主键编号
ConfigID: 0, //配置编号
......@@ -77,39 +79,40 @@
SingleRoomShareMoney: 0, //单房差分摊费用
InlandTrafficShareMoney: 0, //内陆段交通分摊费用
OtherShareMoney: 0, //杂费分摊费用
CostCurrencyList:[],//选择的币种
CostNumberList:[],//人数
},
CostCurrencyList: [], //选择的币种
CostNumberList: [], //人数
CurrencyNumberListExt: [], //币种和人数列表
//团报价信息
teamPrice:{
QuotationId:0,//主键编号
TeamId:0,//团期编号
ConfigID:0,//团队配置编号
OfferId:0,//报价编号
B2BMemberPrice:0,//同业会员价
B2BPrice:0,//同业价格
B2CMemberPrice:0,//直客会员价,
B2CPrice:0,//直客价格
ChildNeedPrice:0,//小孩占床价格,
ChildNoNeedPrice:0,//小孩不占床价格
BabyPrice:0,//婴儿价格
BabyChargePrice:0,//婴儿附加费
OldManChargePrice:0,//老人附加费
VisaPrice:0,//签证
OtherPrice:0,//杂费
SingleRoomPrice:0,//单房差
SingleDMCPrice:0,//单地接
RebatePrice:0,//同行返佣
DiscountPrice:0,//早鸟优惠
IsSupportChildren:1,//是否支持儿童出游（1-支持，2-不支持）
SafeMoney:0,//保险费
PeopleNumber:0,//人数
AirticketMoney:0,//机票费用
BackVisaPrice:0,//退签证费
BackSafeMoney:0,//退保险费
ContractUrl:"",//合同地址
teamPrice: {
QuotationId: 0, //主键编号
TeamId: 0, //团期编号
ConfigID: 0, //团队配置编号
OfferId: 0, //报价编号
B2BMemberPrice: 0, //同业会员价
B2BPrice: 0, //同业价格
B2CMemberPrice: 0, //直客会员价,
B2CPrice: 0, //直客价格
ChildNeedPrice: 0, //小孩占床价格,
ChildNoNeedPrice: 0, //小孩不占床价格
BabyPrice: 0, //婴儿价格
BabyChargePrice: 0, //婴儿附加费
OldManChargePrice: 0, //老人附加费
VisaPrice: 0, //签证
OtherPrice: 0, //杂费
SingleRoomPrice: 0, //单房差
SingleDMCPrice: 0, //单地接
RebatePrice: 0, //同行返佣
DiscountPrice: 0, //早鸟优惠
IsSupportChildren: 1, //是否支持儿童出游（1-支持，2-不支持）
SafeMoney: 0, //保险费
PeopleNumber: 0, //人数
AirticketMoney: 0, //机票费用
BackVisaPrice: 0, //退签证费
BackSafeMoney: 0, //退保险费
ContractUrl: "", //合同地址
},
LineList:[],//线路列表
LineList: [], //线路列表
};
},
methods: {
......@@ -119,23 +122,38 @@
},
//保存数据
SaveData() {
var nObj = {
config: this.postData,
dayCostPriceList: this.dayCostPriceList,
otherPrice: this.otherPrice,
teamPrice: this.teamPrice,
CostCurrencyList: this.CostCurrencyList,
CostNumberList: this.CostNumberList
};
console.log("请求参数", nObj);
this.apipost(
"travel_post_SetConfigOffer_V2", {
config: postData,
dayCostPriceList: dayCostPriceList,
otherPrice: otherPrice,
teamPrice:teamPrice
},
"travel_post_SetConfigOffer_V2", nObj,
res => {
console.log(res.data);
if (res.data.resultCode == 1) {}
if (res.data.resultCode == 1) {
this.Success(res.date.message);
this.goUrl('newQuotation');
} else {
this.Error(res.data.message);
}
},
err => {}
);
},
goUrl(path) {
this.$router.push({
path: path,
query: {
cache: true
}
});
},
getPostData() {
let configId = this.$route.query.configId;
if (configId > 0) {
let msg = {
ID: configId
};
......@@ -143,9 +161,20 @@
"travel_get_GetMyTravelInfo_V2",
msg,
res => {
console.log("res.data.data", res.data);
if (res.data.resultCode == 1) {
console.log("res.data.data",res.data);
this.postData = res.data.data;
var tempData = res.data.data;
this.LineList = tempData.LineList;
if (tempData.dayCostPriceList && tempData.dayCostPriceList != null && tempData.dayCostPriceList.length >
0) {
this.dayCostPriceList = tempData.dayCostPriceList;
}
if (tempData.otherPrice) {
this.otherPrice = tempData.otherPrice;
}
if (tempData.teamPrice) {
this.teamPrice = tempData.teamPrice;
}
} else {
this.Error(res.data.message);
......@@ -153,15 +182,6 @@
},
err => {}
);
} else {
let params = {
isNoOffer: false
};
this.$router.push({
name: "quoTation",
params: params
});
}
}
},
created() {
......
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 72824603
......@@ -26,16 +26,7 @@
</el-select>
</span>
</li>
<li>
<span>
<em>报价单状态</em>
<el-select v-model="queryData.TravelState" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='noLimit'></el-option>
<el-option v-for='item in TravelStateList' :key="item.Id" :label="item.label" :value="item.Id">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>开团状态</em>
......@@ -148,14 +139,7 @@
<div>{{item.CreateUserName}}</div>
</div>
</div>
<div>
<span>报价单状态</span>
<span v-if="item.TravelState==1">草稿</span>
<span v-else-if="item.TravelState==2">待审核</span>
<span v-else-if="item.TravelState==3">审核通过</span>
<span v-else-if="item.TravelState==4">审核拒绝</span>
<span v-else-if="item.TravelState==5">已撤销</span>
</div>
<div>
<span v-if="item.TravelState==2" class="retract opbd" @click="revokeInfo(item.ID)">
<el-tooltip class="item" effect="dark" content="待审核" placement="top-start" popper-class="max-w250">
......@@ -460,7 +444,7 @@
this.$router.push({
path: path,
query: {
configId: 4288,
configId: 0,
blank:'y',
tab:'报价单'
}
......
src/components/TravelManager/TravelQuotationCenter/GroupStageSetting.vue
View file @ 72824603
......@@ -470,7 +470,6 @@
}
},
mounted() {
console.log("获取值",this.postConfig);
var dateObj = this.$calendarUtils.getCurrentDate();
this.yearInput = dateObj.CurrentYear;
this.monthInput = dateObj.CurrentMonth;
......
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