Skip to content

S
SuperMan
Commit 3ca57c07 authored by youjie's avatar youjie
Browse files
Options

修改出团公司

parent 1e992b48
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 769 additions and 20 deletions
src/components/TravelManager/TravelGroupControl/TravelPrice.vue
View file @ 3ca57c07
......@@ -560,10 +560,10 @@
</div>
<div class="TPright clearfix">
<el-form-item>
<el-upload class="avatar-uploader"
action=""
:http-request="uploadImg"
accept="image/jpeg,image/gif,image/png,image/bmp"
<el-upload class="avatar-uploader"
action=""
:http-request="uploadImg"
accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false"
>
<img v-if="priceData.AdImage" :src="priceData.AdImage" class="avatar">
......@@ -571,8 +571,8 @@
<span class="TP_delImg" v-if="priceData.AdImage" @click.stop="delTpImg(priceData)">
<i class="iconfont icon-xingzhuang"></i>
</span>
</el-upload>
</el-form-item>
</el-upload>
</el-form-item>
</div>
</div>
</div>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 3ca57c07
......@@ -1102,6 +1102,9 @@
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
{{$t('Operation.Op_jietuan')}}
</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)">
{{$t('visaT.sale')}}
</el-dropdown-item>
......@@ -1273,12 +1276,20 @@
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
</div>
<!-- 修改出团公司 -->
<EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'/>
</div>
</template>
<script>
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import EditLeaveGroup from './components/EditLeaveGroup.vue';
export default {
components: {
commonHotelInfo,
priceDialog,
EditLeaveGroup
},
provide() {
return {
reload: this.reload
......@@ -1286,6 +1297,8 @@
},
data() {
return {
GroupTypeVisible: false,
GroupTypeObj:{},
dialog: {
show: false,
ConfigId: '',
......@@ -1537,10 +1550,6 @@
};
},
components: {
commonHotelInfo,
priceDialog
},
//监听器
watch: {
// 方法1
......@@ -1549,6 +1558,10 @@
},
},
methods: {
CancelGroupType() {
this.GroupTypeVisible = false
this.GroupTypeObj = {}
},
IsShowAllBranch() {
var flag = true;
if (this.CurrentUserInfo && this.CurrentUserInfo.RB_Branch_id && this.CurrentUserInfo.RB_Branch_id == 1220) {
......@@ -2786,11 +2799,11 @@
if (ActionMenuCode.indexOf("isCommissionDetails") != -1) {
this.isCommissionDetails = true;
}
if (ActionMenuCode.indexOf("SaleB2COrWeChat") != -1) {
this.SaleB2COrWeChatStatus = false;
}
this.CurrentUserInfo = userInfo;
if (this.$route.query.TCID) {
this.queryMsg.TCID = this.$route.query.TCID;
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 3ca57c07
......@@ -827,6 +827,9 @@
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}}
</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)">
{{$t('Operation.Op_b2bView')}}
</el-dropdown-item>
......@@ -941,18 +944,24 @@
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</div>
</el-dialog>
<!-- 修改出团公司 -->
<EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'/>
</div>
</template>
<script>
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import EditLeaveGroup from './components/EditLeaveGroup.vue';
export default {
components: {
priceDialog,
commonHotelInfo,
EditLeaveGroup
},
data() {
return {
GroupTypeVisible: false,
GroupTypeObj:{},
isCommissionDetails: false, //团控提成详情权限
dialog: {
show: false,
......@@ -1130,6 +1139,10 @@
};
},
methods: {
CancelGroupType() {
this.GroupTypeVisible = false
this.GroupTypeObj = {}
},
//酒店餐厅处理跳转
goHotelDiningBus(item, HotelDiningBus, type) {
if (type == 1) {
......
src/components/TravelManager/TravelList/components/EditLeaveGroup.vue 0 → 100644
View file @ 3ca57c07
<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()
}else{
this.$message.info('操作失败！');
}
this.loading = false
}, err => {})
},
Cancel() {
this.$emit('Cancel')
},
},
mounted() {
}
};
</script>
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 3ca57c07
......@@ -709,6 +709,9 @@
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}}
</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>
<el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
......@@ -840,18 +843,24 @@
<el-dialog :visible.sync="dialog.show" width="1400px" title="报价详情">
<price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
</el-dialog>
<!-- 修改出团公司 -->
<EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'/>
</div>
</template>
<script>
import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import EditLeaveGroup from './components/EditLeaveGroup.vue';
export default {
components: {
priceDialog,
commonHotelInfo
commonHotelInfo,
EditLeaveGroup
},
data() {
return {
GroupTypeVisible: false,
GroupTypeObj:{},
dialog: {
show: false,
ConfigId: '',
......@@ -1038,6 +1047,10 @@
}
},
methods: {
CancelGroupType() {
this.GroupTypeVisible = false
this.GroupTypeObj = {}
},
IsShowAllBranch() {
var flag = true;
if (this.CurrentUserInfo && this.CurrentUserInfo.RB_Branch_id && this.CurrentUserInfo.RB_Branch_id == 1220) {
......@@ -1935,7 +1948,7 @@
if (this.queryCommonData.IsParentCompany != 1) {
if (this.CurrentUserInfo.RB_Branch_id != 49&&this.CurrentUserInfo.RB_Branch_id != 1245) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
}
}
this.getControlList()
......
src/components/dmc/manager/GroupTypeAudit.vue 0 → 100644
View file @ 3ca57c07
This diff is collapsed.
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 3ca57c07
......@@ -652,7 +652,7 @@
<el-date-picker clearable class="w150" v-model="priceData.SendVisaTime" type="date"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<el-form-item v-if="false" prop="OutBranchId" style="margin-top:1px;">
<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-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
......@@ -2088,4 +2088,4 @@
TravelPriceFlightListSelf: TravelPriceFlightList_Self,
}
};
</script>
\ No newline at end of file
</script>
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 3ca57c07
......@@ -651,7 +651,7 @@
<el-date-picker clearable class="w150" v-model="priceData.SendVisaTime" type="date"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<el-form-item v-if="false" prop="OutBranchId" style="margin-top:1px;">
<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-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ 3ca57c07
......@@ -601,7 +601,7 @@
<el-date-picker clearable class="w150" v-model="priceData.SendVisaTime" type="date"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<el-form-item v-if="false" prop="OutBranchId" style="margin-top:1px;">
<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-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
......@@ -1159,7 +1159,7 @@
),
//删除的绑定的航班编号
DeleteAirticketIds: "",
AirportService: "", //机场服务
//可销售机票数量
CanSellTicketNum: 0,
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ 3ca57c07
......@@ -627,7 +627,7 @@
<el-date-picker clearable class="w150" v-model="priceData.SendVisaTime" type="date"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<el-form-item v-if="false" prop="OutBranchId" style="margin-top:1px;">
<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-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
......
src/router/config.js
View file @ 3ca57c07
......@@ -4925,6 +4925,14 @@ export default {
title: '地接供应商'
}
},
{
path: '/GroupTypeAudit',
name: 'GroupTypeAudit',
component: resolve => require(['@/components/dmc/manager/GroupTypeAudit'], resolve),
meta: {
title: '团队类型审核'
}
},
{
path: '/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