Skip to content

S
SuperMan
Commit d13ff238 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 84b76473 7ad6c18e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1107 additions and 107 deletions
src/components/FinancialModule/platformFinancial.vue
View file @ d13ff238
...@@ -11,9 +11,6 @@ ...@@ -11,9 +11,6 @@
<div class="query-box" style="margin-bottom: 0px;"> <div class="query-box" style="margin-bottom: 0px;">
<el-form class="_info_box clearfix" label-width="110px"> <el-form class="_info_box clearfix" label-width="110px">
<el-row style="padding:15px 20px 0 0;"> <el-row style="padding:15px 20px 0 0;">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="所属公司："> <el-form-item label="所属公司：">
<el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()" class=""> <el-select filterable v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()" class="">
...@@ -53,6 +50,7 @@ ...@@ -53,6 +50,7 @@
<li class="hight_query"> <li class="hight_query">
<button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" @click="method5()">导出</button>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -65,9 +63,8 @@ ...@@ -65,9 +63,8 @@
<template v-if="multipleSelection.length>0"> <template v-if="multipleSelection.length>0">
<el-tag size="small" <el-tag size="small"
style="margin-right: 5px;margin-bottom: 5px;" style="margin-right: 5px;margin-bottom: 5px;"
v-for="(x,index) in multipleSelection" :key="x.FrID" > v-for="(x,index) in multipleSelection" :key="x.FrID" :type="x.Type==0?'danger':''">
{{x.Alias}}：{{x.TotalMoney}} {{x.Alias}}：{{x.TotalMoney}}
</el-tag> </el-tag>
</template> </template>
</div> </div>
...@@ -517,7 +514,30 @@ export default { ...@@ -517,7 +514,30 @@ export default {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getPageList(); this.getPageList();
}, },
method5: function() {
if(!this.msg.ClientID)this.msg.ClientID="";
if(!this.msg.ClientType)this.msg.ClientType=0;
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
if(this.msg.TemplateIds=='0')this.msg.TemplateIds='';
if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-1;
if(this.msg.HelpBranchId === '')this.msg.HelpBranchId=-1;
if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
if(!this.msg.TCID)this.msg.TCID=0;
if(!this.msg.OrderID)this.msg.OrderID=0;
if(!this.msg.Status)this.msg.Status=0;
if(!this.msg.FrID)this.msg.FrID=0;
if(!this.msg.NewFinanceId)this.msg.NewFinanceId=0;
if(!this.msg.Conditon)this.msg.Conditon=1;
if(!this.msg.TradeWay)this.msg.TradeWay=0;
if(!this.msg.AccountType)this.msg.AccountType=0;
if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
let time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
var fileName = `平台在途金额统计${time}.xls`;
this.GetLocalFile("Financial_post_GetPlatformStatisticsExport", this.msg,fileName);
} ,
getPageList(){ // 获取列表数据 getPageList(){ // 获取列表数据
if(!this.msg.ClientID)this.msg.ClientID=""; if(!this.msg.ClientID)this.msg.ClientID="";
if(!this.msg.ClientType)this.msg.ClientType=0; if(!this.msg.ClientType)this.msg.ClientType=0;
......
src/components/SalesModule/groupTourOrder.vue
View file @ d13ff238
...@@ -2160,7 +2160,9 @@ ...@@ -2160,7 +2160,9 @@
</p> </p>
<span style="display: block">{{ $t("salesModule.RoomInfo") <span style="display: block">{{ $t("salesModule.RoomInfo")
}}<span v-if="item.oneSex > 0" }}<span v-if="item.oneSex > 0"
style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span>：{{ item.orderGuestHouseStr }}</span> style="color: #e95252">（{{ item.oneSex == 1 ? "单男" : "单女" }}）</span><span v-if="item.chirdNoNeedBedNum > 0"
style="color: #e95252">（不占床人数{{ item.chirdNoNeedBedNum }}人）</span>：{{ item.orderGuestHouseStr }}</span>
<div> <div>
<span v-if="item.opTipMoney == '' && item.tipMoney != ''" <span v-if="item.opTipMoney == '' && item.tipMoney != ''"
......
src/components/SalesModule/productQuery.vue
View file @ d13ff238
...@@ -3311,7 +3311,7 @@ export default { ...@@ -3311,7 +3311,7 @@ export default {
// this.addMsg.Remarks = this.addMsg.Remarks + text + ':' + (count-this.addMsg[key]) + ';' // this.addMsg.Remarks = this.addMsg.Remarks + text + ':' + (count-this.addMsg[key]) + ';'
// } // }
}, },
// 获取微信二维码 // 获取微信二维码（旅小友）
getWxCode: function (key) { getWxCode: function (key) {
this.wxLoading = false; this.wxLoading = false;
if (this.list[key].wxImage === "") { if (this.list[key].wxImage === "") {
...@@ -3335,6 +3335,30 @@ export default { ...@@ -3335,6 +3335,30 @@ export default {
); );
} }
}, },
// 获取微信（和平商旅）二维码
getWxHPSLCode: function (key) {
this.wxLoading = false;
if (this.list[key].wxImage === "") {
this.wxLoading = true;
this.apipost(
"TaskManagemnet_get_GetWeiXinShareHPSL",
{
ConfigId: this.list[key].ConfigID,
TCID: this.list[key].TCID,
},
(res) => {
if (res.data.resultCode == 1) {
let url = res.data.data;
this.list[key].wxImage = url;
this.wxLoading = false;
} else {
this.$message.error("二维码获取失败");
}
},
(err) => {}
);
}
},
toTrip: function (obj) { toTrip: function (obj) {
this.tripObj.tcid = obj.TCID; this.tripObj.tcid = obj.TCID;
this.tripObj.configId = obj.ConfigID; this.tripObj.configId = obj.ConfigID;
......
src/components/TravelManager/TravelGroupControl/TravelPrice.vue
View file @ d13ff238
...@@ -560,10 +560,10 @@ ...@@ -560,10 +560,10 @@
</div> </div>
<div class="TPright clearfix"> <div class="TPright clearfix">
<el-form-item> <el-form-item>
<el-upload class="avatar-uploader" <el-upload class="avatar-uploader"
action="" action=""
:http-request="uploadImg" :http-request="uploadImg"
accept="image/jpeg,image/gif,image/png,image/bmp" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" :show-file-list="false"
> >
<img v-if="priceData.AdImage" :src="priceData.AdImage" class="avatar"> <img v-if="priceData.AdImage" :src="priceData.AdImage" class="avatar">
...@@ -571,8 +571,8 @@ ...@@ -571,8 +571,8 @@
<span class="TP_delImg" v-if="priceData.AdImage" @click.stop="delTpImg(priceData)"> <span class="TP_delImg" v-if="priceData.AdImage" @click.stop="delTpImg(priceData)">
<i class="iconfont icon-xingzhuang"></i> <i class="iconfont icon-xingzhuang"></i>
</span> </span>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
</div> </div>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ d13ff238
...@@ -1102,6 +1102,9 @@ ...@@ -1102,6 +1102,9 @@
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)"> <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
{{$t('Operation.Op_jietuan')}} {{$t('Operation.Op_jietuan')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="GroupTypeObj=item,GroupTypeVisible=true">
<div>修改出团公司 </div>
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1,item.TravelEndAudit)"> <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1,item.TravelEndAudit)">
{{$t('visaT.sale')}} {{$t('visaT.sale')}}
</el-dropdown-item> </el-dropdown-item>
...@@ -1191,6 +1194,23 @@ ...@@ -1191,6 +1194,23 @@
</div> </div>
</div> </div>
</div> </div>
<div class="TC_remarkContent" v-if="item.BranchAuditState>0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto;">
<span style="color: black;">出团公司调整： {{item.BranchApplyResion}}</span>
<template v-if="item.BranchAuditState==1">
<span style="color:blue;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==2">
<span style="color:green;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==3">
<span style="color:red;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
<span style="color:red;">原因: {{item.BranchAuditRemark}}</span>
</template>
</div>
</div>
</div>
</li> </li>
</ul> </ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div> <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
...@@ -1207,7 +1227,8 @@ ...@@ -1207,7 +1227,8 @@
<el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;"> <el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">
{{$t('system.table_chekAll')}}</el-checkbox> {{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog"> <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name" :disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false"> <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name"
:disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false">
{{sales.Name}}</el-checkbox> {{sales.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
...@@ -1273,12 +1294,21 @@ ...@@ -1273,12 +1294,21 @@
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog> <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog> </el-dialog>
</div> </div>
<!-- 修改出团公司 -->
<EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'
@Success="getControlList()" />
</div> </div>
</template> </template>
<script> <script>
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue"; import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import priceDialog from '../TravelNewQuotation/priceDialog.vue'; import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import EditLeaveGroup from './components/EditLeaveGroup.vue';
export default { export default {
components: {
commonHotelInfo,
priceDialog,
EditLeaveGroup
},
provide() { provide() {
return { return {
reload: this.reload reload: this.reload
...@@ -1286,13 +1316,15 @@ ...@@ -1286,13 +1316,15 @@
}, },
data() { data() {
return { return {
GroupTypeVisible: false,
GroupTypeObj: {},
dialog: { dialog: {
show: false, show: false,
ConfigId: '', ConfigId: '',
OfferId: '' OfferId: ''
}, },
isCommissionDetails: false, //团控提成详情权限 isCommissionDetails: false, //团控提成详情权限
SaleB2COrWeChatStatus:true,//上架B2C或者微信小程序 SaleB2COrWeChatStatus: true, //上架B2C或者微信小程序
QSendCommissionStateList: [{ QSendCommissionStateList: [{
Name: '不限', Name: '不限',
ID: 0 ID: 0
...@@ -1537,10 +1569,6 @@ ...@@ -1537,10 +1569,6 @@
}; };
}, },
components: {
commonHotelInfo,
priceDialog
},
//监听器 //监听器
watch: { watch: {
// 方法1 // 方法1
...@@ -1549,6 +1577,10 @@ ...@@ -1549,6 +1577,10 @@
}, },
}, },
methods: { methods: {
CancelGroupType() {
this.GroupTypeVisible = false
this.GroupTypeObj = {}
},
IsShowAllBranch() { IsShowAllBranch() {
var flag = true; var flag = true;
if (this.CurrentUserInfo && this.CurrentUserInfo.RB_Branch_id && this.CurrentUserInfo.RB_Branch_id == 1220) { if (this.CurrentUserInfo && this.CurrentUserInfo.RB_Branch_id && this.CurrentUserInfo.RB_Branch_id == 1220) {
...@@ -2764,7 +2796,8 @@ ...@@ -2764,7 +2796,8 @@
this.CurrentUserInfo.RB_Branch_id == 0 || this.CurrentUserInfo.RB_Branch_id == 0 ||
this.CurrentUserInfo.RB_Branch_id == 1216 || this.CurrentUserInfo.RB_Branch_id == 1216 ||
this.CurrentUserInfo.RB_Branch_id == 49 || this.CurrentUserInfo.RB_Branch_id == 49 ||
this.CurrentUserInfo.RB_Branch_id == 1218 this.CurrentUserInfo.RB_Branch_id == 1218 ||
this.CurrentUserInfo.RB_Branch_id == 1249
) { ) {
this.IsModifyTravelControl = 1; this.IsModifyTravelControl = 1;
} else { } else {
...@@ -2786,11 +2819,11 @@ ...@@ -2786,11 +2819,11 @@
if (ActionMenuCode.indexOf("isCommissionDetails") != -1) { if (ActionMenuCode.indexOf("isCommissionDetails") != -1) {
this.isCommissionDetails = true; this.isCommissionDetails = true;
} }
if (ActionMenuCode.indexOf("SaleB2COrWeChat") != -1) { if (ActionMenuCode.indexOf("SaleB2COrWeChat") != -1) {
this.SaleB2COrWeChatStatus = false; this.SaleB2COrWeChatStatus = false;
} }
this.CurrentUserInfo = userInfo; this.CurrentUserInfo = userInfo;
if (this.$route.query.TCID) { if (this.$route.query.TCID) {
this.queryMsg.TCID = this.$route.query.TCID; this.queryMsg.TCID = this.$route.query.TCID;
...@@ -2831,7 +2864,7 @@ ...@@ -2831,7 +2864,7 @@
} }
if ( if (
this.queryCommonData.IsParentCompany != 1 && this.queryCommonData.IsParentCompany != 1 &&
this.CurrentUserInfo.RB_Branch_id != 49 this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1249
) { ) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id); this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
} }
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ d13ff238
...@@ -827,6 +827,9 @@ ...@@ -827,6 +827,9 @@
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)"> <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}} {{$t('Operation.Op_jietuan')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="GroupTypeObj=item,GroupTypeVisible=true">
<div>修改出团公司 </div>
</el-dropdown-item>
<el-dropdown-item @click.native="goB2B(item.ConfigId, item.TCID , 1)"> <el-dropdown-item @click.native="goB2B(item.ConfigId, item.TCID , 1)">
{{$t('Operation.Op_b2bView')}} {{$t('Operation.Op_b2bView')}}
</el-dropdown-item> </el-dropdown-item>
...@@ -876,6 +879,23 @@ ...@@ -876,6 +879,23 @@
</div> </div>
</div> </div>
</div> </div>
<div class="TC_remarkContent" v-if="item.BranchAuditState>0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto;">
<span style="color: black;">出团公司调整： {{item.BranchApplyResion}}</span>
<template v-if="item.BranchAuditState==1">
<span style="color:blue;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==2">
<span style="color:green;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==3">
<span style="color:red;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
<span style="color:red;">原因: {{item.BranchAuditRemark}}</span>
</template>
</div>
</div>
</div>
</li> </li>
</ul> </ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div> <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
...@@ -941,18 +961,25 @@ ...@@ -941,18 +961,25 @@
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog> <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</div> </div>
</el-dialog> </el-dialog>
<!-- 修改出团公司 -->
<EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'
@Success="getControlList()" />
</div> </div>
</template> </template>
<script> <script>
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue"; import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import priceDialog from '../TravelNewQuotation/priceDialog.vue'; import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import EditLeaveGroup from './components/EditLeaveGroup.vue';
export default { export default {
components: { components: {
priceDialog, priceDialog,
commonHotelInfo, commonHotelInfo,
EditLeaveGroup
}, },
data() { data() {
return { return {
GroupTypeVisible: false,
GroupTypeObj: {},
isCommissionDetails: false, //团控提成详情权限 isCommissionDetails: false, //团控提成详情权限
dialog: { dialog: {
show: false, show: false,
...@@ -1130,6 +1157,10 @@ ...@@ -1130,6 +1157,10 @@
}; };
}, },
methods: { methods: {
CancelGroupType() {
this.GroupTypeVisible = false
this.GroupTypeObj = {}
},
//酒店餐厅处理跳转 //酒店餐厅处理跳转
goHotelDiningBus(item, HotelDiningBus, type) { goHotelDiningBus(item, HotelDiningBus, type) {
if (type == 1) { if (type == 1) {
...@@ -1888,7 +1919,9 @@ ...@@ -1888,7 +1919,9 @@
if (this.$route.query.tcmun) { if (this.$route.query.tcmun) {
this.queryMsg.TCNUM = this.$route.query.tcmun; this.queryMsg.TCNUM = this.$route.query.tcmun;
} }
if (this.$route.query.TCID) {
this.queryMsg.TCID = this.$route.query.TCID;
}
if (userInfo.IsParentCompany == undefined) { if (userInfo.IsParentCompany == undefined) {
this.queryCommonData.IsParentCompany = 2; this.queryCommonData.IsParentCompany = 2;
} else { } else {
...@@ -1910,7 +1943,8 @@ ...@@ -1910,7 +1943,8 @@
this.queryMsg.StartGroupDate = nowDate; this.queryMsg.StartGroupDate = nowDate;
} }
if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224) { if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 &&
userInfo.RB_Branch_id != 1249) {
this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id); this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
} }
//默认查询全部团队状态 //默认查询全部团队状态
......
src/components/TravelManager/TravelList/components/EditLeaveGroup.vue 0 → 100644
View file @ d13ff238
<style>
</style>
<template>
<div>
<el-dialog width="400px" title="申请修改出团公司" :visible.sync="outerVisible" @close="Cancel">
<div>
<el-select v-model="msg.NewOutBranchId" placeholder="请选择出团公司"
style="width: 100%;">
<el-option
v-for="item in newCompanyList"
:key="item.id"
:label="item.bName"
:value="item.id">
</el-option>
</el-select>
</div>
<div style="margin-top: 10px;">
<el-input
type="textarea"
:autosize="{ minRows: 4, maxRows: 8}"
placeholder="填写申请修改出团公司缘由"
v-model="msg.ApplyResion" />
</div>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="Cancel">取 消</button> &nbsp;
<el-button class="normalBtn" type="primary" @click="FirmApplication"
:loading="loading">确定</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
props:['item'],
data() {
return {
loading: false,
newCompanyList:[],
companyList:[],
outerVisible: true,
newGroupType:[],
groupType:[
{Name:'小包团',Id:1},
{Name:'当地游',Id:2},
{Name:'常规团',Id:0}
],
msg:{
TCID: 0,
NewOutBranchId: null,
ApplyResion: ''
}
};
},
watch: {
item: {
handler(newValue) {
this.msg.TCID = newValue.TCID
this.newGroupType = this.groupType.filter(x=>{
return x.Id!=newValue.TeamType
})
this.getCompanyList()
},
immediate: true
},
},
mounted(){
},
methods: {
getCompanyList() {
//出团公司
this.apipost(
"sellorder_post_GetBranchList", {},
res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
this.newCompanyList = this.companyList .filter(x=>{
return x.id!=this.item.OutBranchId
})
}
},
err => {}
);
},
FirmApplication() {
if(this.msg.NewOutBranchId==null){
return this.$message.error('请选择出团公司');
}
if(this.msg.ApplyResion==''){
return this.$message.error('请输入申请修改出团公司缘由');
}
this.loading = true
this.apipost('travel_post_SetApplyPriceTeamType', this.msg, res => {
if (res.data.resultCode == 1) {
this.$message.success('操作成功！');
this.Cancel()
this.$emit('Success')
}else{
this.$message.info('操作失败！');
}
this.loading = false
}, err => {})
},
Cancel() {
this.$emit('Cancel')
},
},
mounted() {
}
};
</script>
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ d13ff238
...@@ -244,8 +244,10 @@ ...@@ -244,8 +244,10 @@
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales"> <el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">
{{$t('system.table_chekAll')}}</el-checkbox> {{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales"> <el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name" :disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false"> <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id"
{{sales.Name}}</el-checkbox> :key="sales.Name"
:disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false">
{{sales.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
...@@ -709,6 +711,9 @@ ...@@ -709,6 +711,9 @@
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)"> <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}} {{$t('Operation.Op_jietuan')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="GroupTypeObj=item,GroupTypeVisible=true">
<div>修改出团公司 </div>
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">{{$t('visaT.sale')}} <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">{{$t('visaT.sale')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)" <el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
...@@ -762,6 +767,23 @@ ...@@ -762,6 +767,23 @@
</div> </div>
</div> </div>
</div> </div>
<div class="TC_remarkContent" v-if="item.BranchAuditState>0">
<div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto;">
<span style="color: black;">出团公司调整： {{item.BranchApplyResion}}</span>
<template v-if="item.BranchAuditState==1">
<span style="color:blue;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==2">
<span style="color:green;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
</template>
<template v-if="item.BranchAuditState==3">
<span style="color:red;font-weight:bold;">【{{item.BranchAuditStateStr}}】</span>
<span style="color:red;">原因: {{item.BranchAuditRemark}}</span>
</template>
</div>
</div>
</div>
</li> </li>
</ul> </ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div> <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
...@@ -840,25 +862,32 @@ ...@@ -840,25 +862,32 @@
<el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情"> <el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog> <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog> </el-dialog>
<!-- 修改出团公司 -->
<EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'
@Success="getControlList()" />
</div> </div>
</template> </template>
<script> <script>
import priceDialog from '../TravelNewQuotation/priceDialog.vue'; import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue"; import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import EditLeaveGroup from './components/EditLeaveGroup.vue';
export default { export default {
components: { components: {
priceDialog, priceDialog,
commonHotelInfo commonHotelInfo,
EditLeaveGroup
}, },
data() { data() {
return { return {
GroupTypeVisible: false,
GroupTypeObj: {},
dialog: { dialog: {
show: false, show: false,
ConfigId: '', ConfigId: '',
OfferId: '' OfferId: ''
}, },
isCommissionDetails: false, //团控提成详情权限 isCommissionDetails: false, //团控提成详情权限
SaleB2COrWeChatStatus:true,//上架B2C或者微信小程序 SaleB2COrWeChatStatus: true, //上架B2C或者微信小程序
QSendCommissionStateList: [{ QSendCommissionStateList: [{
Name: '不限', Name: '不限',
ID: 0 ID: 0
...@@ -1038,6 +1067,10 @@ ...@@ -1038,6 +1067,10 @@
} }
}, },
methods: { methods: {
CancelGroupType() {
this.GroupTypeVisible = false
this.GroupTypeObj = {}
},
IsShowAllBranch() { IsShowAllBranch() {
var flag = true; var flag = true;
if (this.CurrentUserInfo && this.CurrentUserInfo.RB_Branch_id && this.CurrentUserInfo.RB_Branch_id == 1220) { if (this.CurrentUserInfo && this.CurrentUserInfo.RB_Branch_id && this.CurrentUserInfo.RB_Branch_id == 1220) {
...@@ -1901,8 +1934,8 @@ ...@@ -1901,8 +1934,8 @@
this.isCommissionDetails = true; this.isCommissionDetails = true;
} }
if (ActionMenuCode.indexOf("SaleB2COrWeChat") != -1) { if (ActionMenuCode.indexOf("SaleB2COrWeChat") != -1) {
this.SaleB2COrWeChatStatus = false; this.SaleB2COrWeChatStatus = false;
} }
this.CurrentUserInfo = userInfo this.CurrentUserInfo = userInfo
if (this.$route.query.tcmun) { if (this.$route.query.tcmun) {
...@@ -1933,9 +1966,10 @@ ...@@ -1933,9 +1966,10 @@
this.queryMsg.StartGroupDate = nowDate this.queryMsg.StartGroupDate = nowDate
} }
if (this.queryCommonData.IsParentCompany != 1) { if (this.queryCommonData.IsParentCompany != 1) {
if (this.CurrentUserInfo.RB_Branch_id != 49&&this.CurrentUserInfo.RB_Branch_id != 1245) { if (this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1245 && this.CurrentUserInfo
.RB_Branch_id != 1249) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id) this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
} }
} }
this.getControlList() this.getControlList()
......
src/components/commonPage/DMCchooseImg.vue
View file @ d13ff238
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
<span style="margin-left:24px;"> <span style="margin-left:24px;">
<input type="text" class="resource-name resAddImg" v-model="queryMsg.Name" @keyup.enter="getList" <input type="text" class="resource-name resAddImg" v-model="queryMsg.Name" @keyup.enter="getList"
placeholder="请输入关键字" /> placeholder="请输入关键字" />
<span class="search-imgicon"><i class="iconfont icon-img_cz searchImgIcon" @click="getList"></i></span> <span class="search-imgicon"><i class="iconfont icon-img_cz searchImgIcon" @click="queryMsg.currentPage=1,queryMsg.pageIndex=1,getList()"></i></span>
</span> </span>
<div class="addimgContent test-1" v-loading="loading"> <div class="addimgContent test-1" v-loading="loading">
<div class="addimgDiv" v-for="(item, index) in imglistArry" :key="item.subCode" <div class="addimgDiv" v-for="(item, index) in imglistArry" :key="item.subCode"
......
src/components/dmc/manager/GroupOutCorporationAudit.vue 0 → 100644
View file @ d13ff238
This diff is collapsed.
src/components/myOrdersAllType/components/OrderList.vue
View file @ d13ff238
...@@ -596,17 +596,17 @@ ...@@ -596,17 +596,17 @@
<el-form label-width="100px"> <el-form label-width="100px">
<el-row> <el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="应收总金额" prop=""> <el-form-item label="申请改价金额" prop="" >
<el-input <el-input
type="number" type="number" placeholder="最终的应收总金额"
v-model="changePriceMsg.Money" v-model="changePriceMsg.Money"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="改价原因" prop=""> <el-form-item label="改价原因" prop="" >
<el-input <el-input
type="textarea" type="textarea" placeholder="填写改价原因，不是价格哟"
v-model="changePriceMsg.ApplyForReason" v-model="changePriceMsg.ApplyForReason"
autosize autosize
></el-input> ></el-input>
......
src/components/myOrdersAllType/components/allList.vue
View file @ d13ff238
...@@ -811,18 +811,17 @@ ...@@ -811,18 +811,17 @@
this.DatelistBM = [new Date(this.msg.StartTime),new Date()] this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
}else{ }else{
var now = new Date(); var now = new Date();
var month = now.getMonth();//js获取到的是月份是 0-11 所以要加1 var month = now.getMonth()+1;//js获取到的是月份是 0-11 所以要加1
var year = now.getFullYear(); var year = now.getFullYear();
var nextMonthFirstDay = new Date([year,month + 1,1].join('-')).getTime(); var nextMonthFirstDay = new Date([year,month ,1].join('-')).getTime();
var oneDay = 1000 * 24 * 60 * 60; var oneDay = 1000 * 24 * 60 * 60;
var monthLast = new Date(nextMonthFirstDay - oneDay).getDate() var monthLast = new Date(nextMonthFirstDay - oneDay).getDate()
if(!this.$route.query.DepartSTime&&!this.$route.query.DepartSTime){ if(!this.$route.query.DepartSTime&&!this.$route.query.DepartSTime){
this.msg.DepartSTime = '2023-04-01';//[year,month,1].join('-')
this.msg.DepartSTime = '2023-04-01';
this.msg.DepartETime = [year,month,monthLast].join('-'); this.msg.DepartETime = [year,month,monthLast].join('-');
this.msg2.DepartSTime = '2023-04-01';//[year,month,1].join('-') this.msg2.DepartSTime = '2023-04-01';
this.msg2.DepartETime = [year,month,monthLast].join('-'); this.msg2.DepartETime = [year,month,monthLast].join('-');
// this.msg.DepartSTime = this.getBeforeDate(200, new Date())
// this.msg.DepartETime = this.getBeforeDate(0, new Date())
} }
this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime] this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime]
this.msg.Q_IsCollect = '2' this.msg.Q_IsCollect = '2'
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ d13ff238
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span> <span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
<template v-if="true"> <template v-if="true">
<span v-if="FeatureData.FeatureType==9" class="foldList" style="margin-right: 5px;" <span v-if="FeatureData.FeatureType==9" class="foldList" style="margin-right: 5px;"
@click="journeyTemplate()">编辑行程</span> @click="journeyTemplate()">编辑行程</span>
</template> </template>
<div class="TrfList clearfix"> <div class="TrfList clearfix">
<!--&&item.TypeState!=8--> <!--&&item.TypeState!=8-->
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<!-- ppt 模版行程 --> <!-- ppt 模版行程 -->
<div v-if="FeatureData.FeatureType==9&&FeatureDataFlag" v-loading="iframeLoading"> <div v-if="FeatureData.FeatureType==9&&FeatureDataFlag" v-loading="iframeLoading">
<iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;" <iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;"
:style="{'height':myIframeHeigth+'px'}" > :style="{'height':myIframeHeigth+'px'}">
</iframe> </iframe>
<!-- <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0"> <!-- <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0">
<template v-for="url in FeatureData.TripImageListNew"> <template v-for="url in FeatureData.TripImageListNew">
...@@ -132,7 +132,8 @@ ...@@ -132,7 +132,8 @@
:preview-src-list="FeatureData.TripImageListNew"></el-image> :preview-src-list="FeatureData.TripImageListNew"></el-image>
</template> </template>
</div> --> </div> -->
<div v-show="PostMessageText=='暂无行程数据'" style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div> <div v-show="PostMessageText=='暂无行程数据'"
style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -140,7 +141,7 @@ ...@@ -140,7 +141,7 @@
<!-- ppt 模版新增编辑窗口 --> <!-- ppt 模版新增编辑窗口 -->
<pptIframe v-show="dialogPptistVisible" :FeaturePageType="dataAll.FeaturePageType" :Url="TemplateUrl" <pptIframe v-show="dialogPptistVisible" :FeaturePageType="dataAll.FeaturePageType" :Url="TemplateUrl"
@close="closeIframe()"></pptIframe> @close="closeIframe()"></pptIframe>
</div> </div>
</template> </template>
<script> <script>
...@@ -281,8 +282,8 @@ ...@@ -281,8 +282,8 @@
CurrentUserInfo: {}, CurrentUserInfo: {},
dialogPptistVisible: false, dialogPptistVisible: false,
userInfo: {}, userInfo: {},
TemplateUrl:'',// 模版 修改url TemplateUrl: '', // 模版 修改url
myIframeUrl:'',//行程特色url myIframeUrl: '', //行程特色url
myIframeHeigth: 0, myIframeHeigth: 0,
isPostMessage: false, isPostMessage: false,
PostMessageText: '', PostMessageText: '',
...@@ -294,38 +295,44 @@ ...@@ -294,38 +295,44 @@
}, },
methods: { methods: {
closeIframe(){ closeIframe() {
this.dialogPptistVisible = false this.dialogPptistVisible = false
}, },
handleMessage(event,targetOrigin) { handleMessage(event, targetOrigin) {
if(this.isPostMessage) return console.log("event", event);
if(event.data&&event.data.data&&!event.data.data) return console.log("event.data", event.data);
if (event && event.data) { if (this.isPostMessage) return
if (event.data == '行程数据保存成功'||event.data.indexOf('行程特色高')!=-1) { if (event.data && event.data.data && !event.data.data) return
// this.$emit('ConfigInfo',this.myIframeUrl) if (event && event.data) {
this.PostMessageText = '' try {
//行程特色高 if (event.data == '行程数据保存成功' || event.data.indexOf('行程特色高') != -1) {
if (event.data && typeof(event.data)=='string' &&event.data.indexOf('行程特色高')!=-1) { // this.$emit('ConfigInfo',this.myIframeUrl)
let datas = event.data.split('-') this.PostMessageText = ''
this.myIframeHeigth = datas[1]; //行程特色高
this.isPostMessage = true if (event.data && typeof (event.data) == 'string' && event.data.indexOf('行程特色高') != -1) {
let datas = event.data.split('-')
this.myIframeHeigth = datas[1];
this.isPostMessage = true
}
document.all.myIframe.src = this.myIframeUrl + `&t=${new Date().getTime()}`
this.$emit('pptJourney', true)
} else if (event.data == '暂无行程数据') {
this.PostMessageText = event.data
this.$emit('pptJourney', false)
this.isPostMessage = false
} }
document.all.myIframe.src = this.myIframeUrl+`&t=${new Date().getTime()}` } catch {
this.$emit('pptJourney',true)
} else if (event.data == '暂无行程数据') {
this.PostMessageText = event.data
this.$emit('pptJourney',false)
this.isPostMessage = false
} }
} }
this.iframeLoading = false;
this.iframeLoading = false
}, },
// 添加编辑模版 // 添加编辑模版
journeyTemplate(){ journeyTemplate() {
this.isPostMessage = false this.isPostMessage = false;
let href = this.domainManager().PptUrl let href = this.domainManager().PptUrl
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0&TempType=${this.dataAll.FeaturePageType}` this.TemplateUrl =
`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0&TempType=${this.dataAll.FeaturePageType}`
// this.TemplateUrl=`${href}/index/${this.userInfo.EmployeeId}/${this.FeatureData.ConfigId}/0/${this.dataAll.FeaturePageType}` // this.TemplateUrl=`${href}/index/${this.userInfo.EmployeeId}/${this.FeatureData.ConfigId}/0/${this.dataAll.FeaturePageType}`
this.dialogPptistVisible = true this.dialogPptistVisible = true
}, },
...@@ -560,10 +567,10 @@ ...@@ -560,10 +567,10 @@
}); });
} }
this.initFileList(); this.initFileList();
if(this.FeatureData.FeatureType==9) { if (this.FeatureData.FeatureType == 9) {
// this.iframeLoading = true // this.iframeLoading = true
if(document.all.myIframe){ if (document.all.myIframe) {
document.all.myIframe.src = this.myIframeUrl+`&t=${new Date().getTime()}` document.all.myIframe.src = this.myIframeUrl + `&t=${new Date().getTime()}`
} }
} }
...@@ -638,30 +645,30 @@ ...@@ -638,30 +645,30 @@
} }
}, },
mounted() { mounted() {
window.addEventListener('message', this.handleMessage,false); window.addEventListener('message', this.handleMessage, false);
this.userInfo = this.getLocalStorage() this.userInfo = this.getLocalStorage()
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo this.CurrentUserInfo = userInfo
this.MsgBus.$on('FeatureDataFlag', () => { this.MsgBus.$on('FeatureDataFlag', () => {
this.FeatureDataFlag = true this.FeatureDataFlag = true
}); });
let obj = this.TypeArray.find(x=>{ let obj = this.TypeArray.find(x => {
return x.TypeState == this.FeatureData.FeatureType return x.TypeState == this.FeatureData.FeatureType
}) })
if(obj){ if (obj) {
this.clickFeature(obj) this.clickFeature(obj)
} }
this.myIframeUrl = `${this.domainManager().PptUrl}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.$route.query.configId}&index=0&model=3&w=1108` this.myIframeUrl =
if(document.all.myIframe){ `${this.domainManager().PptUrl}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.$route.query.configId}&index=0&model=3&w=1108`
document.all.myIframe.src = this.myIframeUrl+`&t=${new Date().getTime()}` if (document.all.myIframe) {
document.all.myIframe.src = this.myIframeUrl + `&t=${new Date().getTime()}`
} }
}, },
watch: { watch: {
dataAll:{ dataAll: {
handler: function (val, oldVal) { handler: function (val, oldVal) {},
},
deep: true, deep: true,
immediate:true immediate: true
}, },
FeatureData: { FeatureData: {
//深度监听，可监听到对象、数组的变化 //深度监听，可监听到对象、数组的变化
...@@ -671,7 +678,7 @@ ...@@ -671,7 +678,7 @@
}, },
deep: true, deep: true,
immediate:true immediate: true
}, },
"FeatureData.fileList": { "FeatureData.fileList": {
handler: function (val, oldval) { handler: function (val, oldval) {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ d13ff238
...@@ -654,7 +654,7 @@ ...@@ -654,7 +654,7 @@
</el-form-item> </el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;"> <el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span> <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
<el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName"> <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" disabled>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id"> <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option> </el-option>
...@@ -2088,4 +2088,4 @@ ...@@ -2088,4 +2088,4 @@
TravelPriceFlightListSelf: TravelPriceFlightList_Self, TravelPriceFlightListSelf: TravelPriceFlightList_Self,
} }
}; };
</script> </script>
\ No newline at end of file
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ d13ff238
...@@ -653,7 +653,7 @@ ...@@ -653,7 +653,7 @@
</el-form-item> </el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;"> <el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span> <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
<el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName"> <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" disabled>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id"> <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option> </el-option>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ d13ff238
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
</el-form-item> </el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;"> <el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span> <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
<el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName"> <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" disabled>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id"> <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option> </el-option>
...@@ -1159,7 +1159,7 @@ ...@@ -1159,7 +1159,7 @@
), ),
//删除的绑定的航班编号 //删除的绑定的航班编号
DeleteAirticketIds: "", DeleteAirticketIds: "",
AirportService: "", //机场服务 AirportService: "", //机场服务
//可销售机票数量 //可销售机票数量
CanSellTicketNum: 0, CanSellTicketNum: 0,
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ d13ff238
...@@ -629,7 +629,7 @@ ...@@ -629,7 +629,7 @@
</el-form-item> </el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;"> <el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span> <span class="TP_Sendprepend" style="margin:3px -1px 0 0">{{$t('scen.sc_cp')}}</span>
<el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName"> <el-select class="w180" v-model="priceData.OutBranchId" @change="getstandardCurrencyName" disabled>
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id"> <el-option v-for="item in companyList" :key="item.id" :label="item.bName" :value="item.id">
</el-option> </el-option>
......
src/components/newTravelmanager/travelLineTrip/components/travelDaysHV.vue
View file @ d13ff238
...@@ -247,7 +247,6 @@ ...@@ -247,7 +247,6 @@
<img <img
v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage" v-if="ScenicArrayList.length==0&&item.ScenicArray.length==0&&!item.TrafficObj.trafficIntroduce.IntroduceImage"
class="absolute" class="absolute"
style="height: 100%;"
:src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'"> :src="domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'">
</div> </div>
</div> </div>
...@@ -287,8 +286,7 @@ ...@@ -287,8 +286,7 @@
<template v-if="ScenicArrayList&&ScenicArrayList.length>1"> <template v-if="ScenicArrayList&&ScenicArrayList.length>1">
<img <img
v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url" v-if="!ScenicArrayList[1].NewImaArray[0].FileType&&ScenicArrayList[1].NewImaArray[0].Url"
class="absolute" class="absolute" :src="ScenicArrayList[1].NewImaArray[0].Url"
style="height: 100%;" :src="ScenicArrayList[1].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_1'+index"> :id="'viewSpotImg_'+(item*4)+'_1'+index">
</template> </template>
<img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100" <img v-if="ScenicArrayList.length==1&&item.ScenicArray.length==1" class="absolute img100"
...@@ -339,8 +337,7 @@ ...@@ -339,8 +337,7 @@
<template v-if="ScenicArrayList&&ScenicArrayList.length>2"> <template v-if="ScenicArrayList&&ScenicArrayList.length>2">
<img <img
v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url" v-if="!ScenicArrayList[2].NewImaArray[0].FileType&&ScenicArrayList[2].NewImaArray[0].Url"
class="absolute" class="absolute" :src="ScenicArrayList[2].NewImaArray[0].Url"
style="height: 100%;" :src="ScenicArrayList[2].NewImaArray[0].Url"
:id="'viewSpotImg_'+(item*4)+'_2'+index"> :id="'viewSpotImg_'+(item*4)+'_2'+index">
</template> </template>
<img v-if="ScenicArrayList.length>2&&item.ScenicArray.length>2" class="absolute img100" <img v-if="ScenicArrayList.length>2&&item.ScenicArray.length>2" class="absolute img100"
......
src/components/newTravelmanager/travelLineTrip/trifficTripThree.vue
View file @ d13ff238
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<el-form-item <el-form-item
class="StartCity" class="StartCity"
:rules="trifficTripRules.StartCityId"> :rules="trifficTripRules.StartCityId">
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable remote <el-select :disabled="isOpenGroup" class="w120" placeholder="出发城市" filterable remote
v-model="subTraffic.StartCityId" reserve-keyword :remote-method="GetDepartList1" v-model="subTraffic.StartCityId" reserve-keyword :remote-method="GetDepartList1"
@change="changeGetDepartList(subTraffic.StartCityId)"> @change="changeGetDepartList(subTraffic.StartCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
</span> </span>
<span> <span>
<el-form-item :rules="trifficTripRules.ArrivalCityId"> <el-form-item :rules="trifficTripRules.ArrivalCityId">
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable remote <el-select :disabled="isOpenGroup" class="w120" placeholder="到达城市" filterable remote
v-model="subTraffic.ArrivalCityId" reserve-keyword :remote-method="GetArrivalList1" v-model="subTraffic.ArrivalCityId" reserve-keyword :remote-method="GetArrivalList1"
@change="changeArrivalCity(subTraffic.ArrivalCityId)"> @change="changeArrivalCity(subTraffic.ArrivalCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
......
src/router/config.js
View file @ d13ff238
...@@ -4925,6 +4925,14 @@ export default { ...@@ -4925,6 +4925,14 @@ export default {
title: '地接供应商' title: '地接供应商'
} }
}, },
{
path: '/GroupOutCorporationAudit',
name: 'GroupOutCorporationAudit',
component: resolve => require(['@/components/dmc/manager/GroupOutCorporationAudit'], resolve),
meta: {
title: '出团公司审核'
}
},
{ {
path: '/newFeature', path: '/newFeature',
name: 'newFeature', name: 'newFeature',
......
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