Skip to content

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

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

parents f3becd10 c066026c
Hide whitespace changes
Inline Side-by-side
Showing with 251 additions and 20 deletions
src/components/SalesModule/Common/CustomerContactList.vue
View file @ a907eade
......@@ -97,7 +97,7 @@
</el-tooltip>
</div>
<div style="margin-right: 10px;">
<el-tooltip v-if="scope.row.IsActivation==0" class="item" effect="dark" :content="$t('op.ShareInviteCode')" placement="top-start" >
<el-tooltip v-if="scope.row.IsActivation==0&&customerStatus==2" class="item" effect="dark" :content="$t('op.ShareInviteCode')" placement="top-start" >
<el-popover width="180" trigger="click">
<div class="w150" v-loading="wxLoading">
<img style="
......@@ -166,7 +166,7 @@
import addCustomerContact from "./addCustomerContact";
export default {
props: ["customerId"],
props: ["customerId","customerStatus"],
components: {addCustomerContact},
data() {
return {
......
src/components/SalesModule/CouponsList.vue
View file @ a907eade
......@@ -239,7 +239,7 @@
</span>
<el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item v-for="(item,index) in ScopeOfUseList" :key="index"
@click.native="dropdownText = $t('pub.unlimitedSel'), msg.CouponsUseScope = item.Id, getList(), resetPageIndex()">{{ item.Name }}
@click.native="dropdownText = item.Id>0?item.Name:$t('pub.unlimitedSel'), msg.CouponsUseScope = item.Id, getList(), resetPageIndex()">{{ item.Name }}
</el-dropdown-item>
<!-- <el-dropdown-item
@click.native="dropdownText = $t('active.cl_tongyong'), msg.couponsUseScope = 1, getList(), resetPageIndex()">{{$t('active.cl_tongyong')}}
......@@ -319,7 +319,7 @@
lineId: 0, //线路
lineteamId: 0, //系列ID
CustomerType: 0, //0-同行，1-直客
CouponStatus: 0, //1未使用 2已使用 3已过期
CouponStatus: 1, //1未使用 2已使用 3已过期
CouponsUseScope: -1, //优惠券使用范围 有枚举
FromPlatform: 0, //来源平台 1app 2小程序
CouponsType: 0, //优惠券类型 1：抵用券，2：折扣卷
......
src/components/SalesModule/MyCustomer.vue
View file @ a907eade
......@@ -631,7 +631,7 @@
circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('hotel.suplier_contact')" placement="top-start">
<el-button style="padding:4px" @click.stop="customerId=item.customerId,showContact=true" type="danger" icon="el-icon-s-custom"
<el-button style="padding:4px" @click.stop="customerId=item.customerId,customerStatus=item.customerStatus,showContact=true" type="danger" icon="el-icon-s-custom"
circle></el-button>
</el-tooltip>
</td>
......@@ -1033,7 +1033,7 @@
@success="getList"></TeamMemberList>
<!-- 联系人 -->
<CustomerContactList v-if="showContact" :customerId="customerId" @close="showContact=false,customerId=null"
<CustomerContactList v-if="showContact" :customerStatus="customerStatus" :customerId="customerId" @close="showContact=false,customerId=null"
@success="getList"></CustomerContactList>
</div>
......@@ -1240,7 +1240,8 @@
{ Name: this.$t('objFill.v101.activity.col3.t4'),Id: 0 },
{ Name: this.$t('objFill.v102.yijihuo'),Id: 1 },
{ Name: this.$t('objFill.v102.weijihuo'),Id: 2 },
]
],
customerStatus: 0,
}
},
methods: {
......
src/components/SalesVisa/ModifyVisaProduct.vue
View file @ a907eade
......@@ -483,7 +483,18 @@
<el-form-item :label="$t('objFill.v101.Rest.qianzhengyxrq')">
<el-input v-model="addMsg.VisaValidity" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item :label="$t('Operation.Op_salesPlat')">
<span style="display: flex;align-items: center;white-space: nowrap;">
<el-checkbox v-model="addMsg.checkDialogAll" @change="checkAllDialog" style="margin-right: 20px">
{{ $t("system.table_chekAll") }}</el-checkbox>
<el-checkbox-group v-model="addMsg.ckedplat" @change="checkDialog">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name"
>
{{ sales.Name }}</el-checkbox>
</el-checkbox-group>
</span>
</el-form-item>
<span class="Travel_Line"></span>
<div>
<el-form-item :label="$t('objFill.v101.Rest.qianzhnegglgj')" prop="VisaCountryId">
......@@ -870,6 +881,9 @@ export default {
CoverImageList: [],
VisaCountryId:"",
RB_Branch_Id:-1,
checkDialogAll: false,
ckedplat: [],
SalePlat: '',
},
rules: {
......@@ -949,6 +963,20 @@ export default {
},
methods: {
//全选弹出框
checkAllDialog(val) {
this.addMsg.ckedplat = [];
if (val) {
this.$tripUtils.TeamStatesList.salsPlat.forEach((x) => {
this.addMsg.ckedplat.push(x.Id);
});
}
},
checkDialog(value) {
let checkedCount = value.length;
this.addMsg.checkDialogAll =
checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length;
},
onEditorChange({editor, html, text}, typeStr) {
//富文本编辑器 文本改变时 设置字段值
switch (typeStr) {
......@@ -1020,7 +1048,15 @@ getCompanyList() {
if (res.data.resultCode == 1) {
let data=res.data.data;
data.RB_Branch_Id = String(data.RB_Branch_Id)
this.addMsg=res.data.data;
this.addMsg = {
...res.data.data,
ckedplat: res.data.data.SalePlatList,
SalePlat: res.data.data.SalePlatList.join(","),
checkDialogAll: false,
};
if(this.addMsg.ckedplat&&this.addMsg.ckedplat.length>0&&this.addMsg.ckedplat.length==this.$tripUtils.TeamStatesList.salsPlat.length){
this.addMsg.checkDialogAll = true;
}
if(this.$route.query.copy){
this.addMsg.Name = '【复制】'+this.addMsg.Name
}
......@@ -1120,6 +1156,7 @@ getCompanyList() {
if(this.$route.query.copy){
this.addMsg.Id = 0
}
this.addMsg.SalePlat = this.addMsg.ckedplat.length>0?this.addMsg.ckedplat.join(','):'';
this.apipost(
"dmc_post_visa_SetVisaProduct_V1",
this.addMsg,
......
src/components/SalesVisa/VisaProduct.vue
View file @ a907eade
......@@ -289,6 +289,32 @@
></el-date-picker>
</span>
</li>
<li style="display: flex;align-items: center;">
<span style="display: flex;align-items: center;">
<em>{{$t("Operation.Op_salesPlat")}}</em>
<span style="display: flex;align-items: center;">
<el-checkbox v-model="msg.checkDialogAll" @change="checkAllDialog" style="margin-right: 20px">
{{ $t("system.table_chekAll") }}</el-checkbox>
<template v-if="CurrentUserInfo.RB_Group_Id == 2">
<el-checkbox-group v-model="msg.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
">
{{ sales.Name }}</el-checkbox>
</el-checkbox-group>
</template>
<template v-else>
<el-checkbox-group v-model="msg.ckedplat" @change="checkDialog">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">
{{ sales.Name }}</el-checkbox>
</el-checkbox-group>
</template>
</span>
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="getList()">{{$t('pub.searchBtn')}}</button>
<!-- <button class="normalBtn" v-show="!buttonshow" @click="cancelEdit(),addShow=true" v-if="msg.isFinacial==1">{{$t('fnc.tianjia')}}</button> -->
......@@ -530,7 +556,41 @@
@click="EditVisaProduct(scope.row,'copy')"
></el-button>
</el-tooltip>
<el-popover v-if="scope.row.SendVisaStatus==1&&msg.isFinacial==1" style="padding: 0" width="300" trigger="click">
<div style="display: flex;flex-direction: column;">
<div style="margin-bottom: 10px;display: flex;justify-content: space-between;">
<em>{{$t("Operation.Op_salesPlat")}}</em>
<el-checkbox v-model="scope.row.checkDialogAll" @change="(val)=>{getcheckAllDialog(val,scope.$index)}" style="margin-right: 20px">
{{ $t("system.table_chekAll") }}</el-checkbox>
</div>
<div style="display: flex;align-items: center;">
<el-checkbox-group v-model="scope.row.ckedplat" @change="(value)=>{getcheckDialog(value,scope.$index)}">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">
{{ sales.Name }}</el-checkbox>
</el-checkbox-group>
</div>
<el-button
:disabled="!scope.row.ckedplat.length"
:loading="PlatformLoading"
type="primary" size="small" style="margin-top: 10px"
@click="setPlatform(scope.row,'copy')"
>{{ $t('pub.saveBtn') }}</el-button>
</div>
<el-tooltip slot="reference"
effect="dark"
:content="$t('fnc.pingtai')"
placement="top-start"
>
<el-button
type="primary"
style="background:#F0A748; border-color:#F0A748"
icon="el-icon-data-board"
></el-button>
</el-tooltip>
</el-popover>
</el-button-group>
</template>
</el-table-column>
</el-table>
......@@ -648,6 +708,10 @@ export default {
VisaStatus: "-1",
isFinacial: 1,
BranchId: "-1",
SalePlat: '',
ckedplat: [],
//弹出框全选
checkDialogAll: false,
},
addMsg: {
Id: 0,
......@@ -711,7 +775,9 @@ export default {
VisaManagementList: [],
// buttonshow:false,
Type:0,
CurrentUserInfo:{},
SaleB2COrWeChatStatus: true, //上架B2C或者微信小程序
PlatformLoading: false,
};
},
created(){
......@@ -719,9 +785,68 @@ export default {
// if (locationName.indexOf('viitto') !== -1 || locationName.indexOf('www') !== -1){
// this.buttonshow=true;
// }
let userInfo = this.getLocalStorage();
// 团提成权限
let ActionMenuCode = userInfo.ActionMenuCode;
if (ActionMenuCode.indexOf("SaleB2COrWeChat") != -1) {
this.SaleB2COrWeChatStatus = false;
}
this.CurrentUserInfo = userInfo;
},
methods: {
setPlatform(item){
let msg = {
Pid: item.Id,
SalePlat: item.ckedplat.join(","),
};
this.PlatformLoading = true
this.apipost(
"dmc_post_visa_SetVisaProductSalePlat",
msg,
res => {
this.PlatformLoading = false
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
}else{
this.Error(res.data.message);
}
},
err => {
this.PlatformLoading = false
this.Error(err.message);
}
);
},
//全选弹出框
getcheckAllDialog(val,index) {
this.dataList[index].ckedplat = [];
if (val) {
this.$tripUtils.TeamStatesList.salsPlat.forEach((x) => {
this.dataList[index].ckedplat.push(x.Id);
});
}
},
getcheckDialog(value) {
let checkedCount = value.length;
this.dataList[index].checkDialogAll =
checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length;
},
//全选弹出框
checkAllDialog(val) {
this.msg.ckedplat = [];
if (val) {
this.$tripUtils.TeamStatesList.salsPlat.forEach((x) => {
this.msg.ckedplat.push(x.Id);
});
}
},
checkDialog(value) {
let checkedCount = value.length;
this.msg.checkDialogAll =
checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length;
},
// 只能查看，不能修改
ChaKan(item){
this.$router.push({
......@@ -909,6 +1034,7 @@ export default {
});
},
getList() {
this.msg.SalePlat = this.msg.ckedplat.length>0?this.msg.ckedplat.join(','):'';
// 获取列表数据
this.apipost(
"dmc_get_visa_GetVisaProductList",
......@@ -918,7 +1044,24 @@ export default {
this.loading = false;
this.dataList = [];
} else {
let arrList = function(arr) {
arr.forEach(x=>{
x.ckedplat = []
x.checkDialogAll = false
x.SalePlat = ''
})
}
arrList(res.data.data.pageData)
this.dataList = res.data.data.pageData;
this.dataList.forEach(x=>{
if(x.SalePlatList.length>0){
x.ckedplat = x.SalePlatList
if(x.SalePlatList.length==this.$tripUtils.TeamStatesList.salsPlat.length){
x.checkDialogAll = true
}
x.SalePlat = x.SalePlatList.split(',')
}
})
this.total = res.data.data.count;
this.loading = false;
}
......
src/components/TravelManager/TravelList/GroupAdvertising.vue
View file @ a907eade
......@@ -60,15 +60,42 @@
:title="$t('pub.updateMsg')"></i></a>
<a :href='item.AdvertisingPicUrl' target="_blank" :download="$t('salesModule.AdvPic')+'.png'"><i class="el-icon-download"
:title="$t('objFill.xz')"></i></a> -->
<span @click="clickDownLoad(item,1)"><i class="el-icon-download" title="旅小友二维码"></i></span>
<span @click="clickDownLoad(item,2)"><i class="el-icon-download" title="行程二维码"></i></span>
<span @click="clickDownLoad(item,3)"><i class="el-icon-download" title="原图下载"></i></span>
<span @click="getPicList(index)"><i class="iconfont icon-view" title="查看原图"></i></span>
<!-- <span @click="clickDownLoad(item,1)"><i class="el-icon-download" title="旅小友二维码"></i></span> -->
<span>
<el-popover
popper-class="_ASDetails"
width="100"
trigger="hover">
<span class="el-dropdown-link" slot="reference">
<i class="el-icon-download el-icon--right"></i>
</span>
<el-dropdown-item @click.native="clickDownLoad(item,1)">旅小友广告</el-dropdown-item>
<el-dropdown-item @click.native="clickDownLoad(item,2)">行程广告</el-dropdown-item>
<el-dropdown-item @click.native="clickDownLoad(item,3)">原图下载</el-dropdown-item>
</el-popover>
<!-- <el-dropdown>
<span class="el-dropdown-link">
<i class="el-icon-download el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item @click.native="clickDownLoad(item,1)">旅小友广告</el-dropdown-item>
<el-dropdown-item @click.native="clickDownLoad(item,2)">行程广告</el-dropdown-item>
<el-dropdown-item @click.native="clickDownLoad(item,3)">原图</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown> -->
</span>
<i class="el-icon-delete" :title="$t('system.ph_shanchu')" @click.stop="deleteItem(item.ID)"></i>
</div>
</div>
<!-- <div style="text-align:center;">
<el-button type="text" @click="clickDownLoad(item,2)">
行程广告图下载
</el-button>
<el-button type="text" @click="clickDownLoad(item,3)">
原图下载
</el-button>
</div> -->
</li>
</ul>
<div v-if='dataList.length==0' style='width:100%;margin-top:50px;text-align:center;color: #ccc;'>
......
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ a907eade
......@@ -206,7 +206,8 @@
:before-upload="beforeUploadVideo" :show-file-list="false" :file-list="VideoStrList">
<el-button size="small" type="primary">{{$t('tips.dianjishanhcuan')}}</el-button>
</el-upload>
<el-button size="small" class="TC_ChoiceBtn" @click="checkType=2,addimg=true" type="primary">{{$t('fnc.xuanze')}}
<el-button size="small" class="TC_ChoiceBtn" @click="checkType=2,addimg=true" type="primary">
{{$t('fnc.xuanze')}}
</el-button>
</div>
<div style="text-align: center;" v-if="VideoStr">
......@@ -237,6 +238,9 @@
<div class="re-delte" @click.stop="addImgOpen(index)">
<i class="iconfont icon-img_cz"></i>
</div>
<div class="re-delte" @click.stop="viewImg(index)">
<i class="iconfont icon-view"></i>
</div>
</div>
</div>
</div>
......@@ -279,6 +283,14 @@
</div>
</el-upload>
</el-dialog>
<div v-if='picIsShow' class="viewBigPicLayer" @click="picIsShow=false">
<i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false"></i>
<el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
<el-carousel-item v-for="(item,index) in picObj" :key="index">
<div class="inlineDiv ownScrollbarStyle"><img :src="item" /></div>
</el-carousel-item>
</el-carousel>
</div>
</div>
</template>
<script>
......@@ -385,7 +397,10 @@
ColorName: this.$t('objFill.subjectcolor')[18],
ColorValue: '#6E4C43'
},
]
],
picIsShow: false,
picObj: [],
initialIndex: 0,
};
},
components: {
......@@ -394,7 +409,15 @@
GGMap: GGMap,
},
methods: {
//获取轮播路径
viewImg(index) {
this.picIsShow = true;
this.picObj = [];
this.initialIndex = index;
this.PostConfig.fileList.forEach(item => {
this.picObj.push(item.Url);
})
},
loadVideo: function () { // 输入地址
if (this.PostConfig.VideoStr)
this.VideoStr = this.VideoStr.indexOf('http') > -1 ? this.VideoStr : this.domainManager().ViittoFileUrl +
......@@ -494,7 +517,7 @@
obj.ID = 0;
obj.Path = this.$commonUtils.removeDomain(imgItem.Path);
obj.PicID = imgItem.ID;
obj.ShowPath = imgItem.Path ;
obj.ShowPath = imgItem.Path;
that.PostConfig.fileList[this.ChooseImgIndex].Url = obj.ShowPath;
});
} else {
......
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