Skip to content

S
SuperMan
Commit 5d026e6b authored by youjie's avatar youjie
Browse files
Options

no message

parent 0003cb15
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 14 deletions
src/components/FinancialModule/CashAccount.vue
View file @ 5d026e6b
......@@ -176,7 +176,7 @@
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')" prop="Alias">
<el-input v-model="addMsg.Alias" class="" maxlength="10"></el-input>
<el-input v-model="addMsg.Alias" class="" maxlength="50"></el-input>
</el-form-item>
</el-col>
......
src/components/FinancialModule/CompanyAccount.vue
View file @ 5d026e6b
......@@ -210,7 +210,7 @@
<el-row>
<el-col :span="4" :gutter="35" >
<el-form-item :label="$t('fnc.accBming')" prop="Alias">
<el-input v-model="addMsg.Alias" class="" maxlength="10"></el-input>
<el-input v-model="addMsg.Alias" class="" maxlength="50"></el-input>
</el-form-item>
</el-col>
......
src/components/FinancialModule/PlatformAccount.vue
View file @ 5d026e6b
......@@ -261,7 +261,7 @@
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')" prop="Alias">
<el-input v-model="addMsg.Alias" class maxlength="10"></el-input>
<el-input v-model="addMsg.Alias" class maxlength="50"></el-input>
</el-form-item>
</el-col>
......
src/components/FinancialModule/PoolAccount.vue
View file @ 5d026e6b
......@@ -176,7 +176,7 @@
<el-row>
<el-col :span="4" :gutter="35">
<el-form-item :label="$t('fnc.accBming')" prop="Alias">
<el-input v-model="addMsg.Alias" class="" maxlength="10"></el-input>
<el-input v-model="addMsg.Alias" class="" maxlength="50"></el-input>
</el-form-item>
</el-col>
......
src/components/FinancialModule/RecPayQuery.vue
View file @ 5d026e6b
......@@ -1565,7 +1565,8 @@ export default {
showhuilv(row){
this.apipost('Financial_get_GetFinanceRate', {FinanceId:row.FrID}, res => {
if (res.data.resultCode == 1) {
this.trabeListHL = res.data.data[0]
this.trabeListHL = []
this.trabeListHL.push(res.data.data[0])
this.costmodeHL = true
}
}, err => {})
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 5d026e6b
......@@ -659,6 +659,13 @@
'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}结算</span>
</el-form-item>
<el-form-item prop="OutGroupType" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">出团类型</span>
<el-select class="w180" v-model="priceData.OutGroupType">
<el-option v-for="item in OutGroupTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">供应商</span>
......@@ -1110,8 +1117,13 @@
Url: "",
Name: ""
},
SaleBranchIdArray: []
SaleBranchIdArray: [],
OutGroupType: 0
},
OutGroupTypeList: [
{Name: '常规', Id: 0},
{Name: '落地团', Id: 1},
],
returnPriceList: this.priceList,
//酒店列表
HotelList: [],
......@@ -2026,7 +2038,15 @@
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList);
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
},
deep: true
},
priceData: {
//深度监听，可监听到对象的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
},
deep: true
},
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 5d026e6b
......@@ -597,6 +597,13 @@
'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}结算</span>
</el-form-item>
<el-form-item prop="OutGroupType" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">出团类型</span>
<el-select class="w180" v-model="priceData.OutGroupType">
<el-option v-for="item in OutGroupTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item style="margin-top:1px;" v-if="TeamType==1">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('visa.v_salecompany')}}</span>
......@@ -766,7 +773,12 @@
Name: ""
},
SaleBranchIdArray: [],
OutGroupType: 0
},
OutGroupTypeList: [
{Name: '常规', Id: 0},
{Name: '落地团', Id: 1},
],
returnPriceList: this.priceList,
companyList: [],
offerList: [],
......@@ -1403,7 +1415,15 @@
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList);
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupTyp);
},
deep: true
},
priceData: {
//深度监听，可监听到对象的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
},
deep: true
},
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ 5d026e6b
......@@ -606,6 +606,14 @@
'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}结算</span>
</el-form-item>
<el-form-item prop="OutGroupType" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">出团类型</span>
<el-select class="w180" v-model="priceData.OutGroupType">
<el-option v-for="item in OutGroupTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
</div>
<div class="TPright clearfix">
<el-form-item prop="YSeat">
......@@ -866,8 +874,13 @@
Url: "",
Name: ""
},
SaleBranchIdArray: []
SaleBranchIdArray: [],
OutGroupType: 0
},
OutGroupTypeList: [
{Name: '常规', Id: 0},
{Name: '落地团', Id: 1},
],
returnPriceList: this.priceList,
//酒店列表
HotelList: [],
......@@ -1688,7 +1701,15 @@
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList);
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
},
deep: true
},
priceData: {
//深度监听，可监听到对象的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
},
deep: true
},
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ 5d026e6b
......@@ -639,6 +639,14 @@
'TCb2c':standardCurrencyName=='新台币','AppPlat':standardCurrencyName=='',
'otherPlat':standardCurrencyName=='',}">{{standardCurrencyName}}结算</span>
</el-form-item>
<el-form-item prop="OutGroupType" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">出团类型</span>
<el-select class="w180" v-model="priceData.OutGroupType">
<el-option v-for="item in OutGroupTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
</div>
<div class="TPright clearfix">
<el-form-item prop="YSeat">
......@@ -1048,8 +1056,13 @@
Url: "",
Name: ""
},
SaleBranchIdArray: []
SaleBranchIdArray: [],
OutGroupType: 0
},
OutGroupTypeList: [
{Name: '常规', Id: 0},
{Name: '落地团', Id: 1},
],
returnPriceList: this.priceList,
//酒店列表
HotelList: [],
......@@ -1892,7 +1905,15 @@
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList);
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
},
deep: true
},
priceData: {
//深度监听，可监听到对象的变化
handler: function (val, oldVal) {
this.initShowPriceList();
this.$emit("headCallBack", this.returnPriceList,this.priceData.OutGroupType);
},
deep: true
},
......
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @ 5d026e6b
......@@ -206,7 +206,8 @@
isNewConfig: true,
isfromManager: true,
isShowMap: false,
travelLngLat: []
travelLngLat: [],
OutGroupType: 0
}
},
components: {
......@@ -247,7 +248,7 @@
}
},
/*获取组件报价信息*/
getPrice(priceObj) {
getPrice(priceObj,OutGroupType) {
priceObj.forEach(objItem => {
var SaleBranchId = ''
if (objItem.SaleBranchIdArray.length > 0) {
......@@ -261,6 +262,7 @@
}
})
this.PostPrice = priceObj
this.OutGroupType = OutGroupType
},
//行程回调
getDaysTrip(tripObj) {
......@@ -305,6 +307,9 @@
basicData.PriceList = this.PostPrice
//配置编号
basicData.ID = this.ConfigId
//团类型0常规 1落地团
basicData.OutGroupType = this.OutGroupType
console.log(basicData,'----1-11111')
if (basicData.ID != null && basicData.ID == 0) {
basicData.customId = this.PostConfig.customId
basicData.allotId = this.PostConfig.allotId
......
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