Commit d3b131ca authored by 黄媛媛's avatar 黄媛媛

App活动

parent 790b293d
......@@ -25,13 +25,13 @@
<li :class="active==1?'_active':''" @click="active=1,tabData(1)">{{$t('fnc.shoukuandan')}}</li>
<li :class="active==2?'_active':''" @click="active=2,tabData(2)">{{$t('fnc.fukuandan')}}</li>
<li v-if="!visaShowTab" :class="active==3?'_active':''" @click="active=3,tabData(3)">挂账单</li>
<li v-if="!visaShowTab" :class="active==4?'_active':''" @click="active=4,tabData(4)">让单</li>
<li v-if="!visaShowTab" :class="active==4?'_active':''" @click="active=4,tabData(4)">让单</li>
</ul>
<ul class="_nav ceshi clearfix" v-else>
<li :class="active==1?'_active':''" v-if="showTab==1">{{$t('fnc.shoukuandan')}}</li>
<li :class="active==2?'_active':''" v-if="showTab==2">{{$t('fnc.fukuandan')}}</li>
<li :class="active==3?'_active':''" v-if="showTab==3">挂账单</li>
<li :class="active==4?'_active':''" v-if="showTab==4">让单</li>
<li :class="active==4?'_active':''" v-if="showTab==4">让单</li>
</ul>
<!-- 搜索框匹配 -->
<div style="margin:10px 0;">
......
......@@ -920,7 +920,7 @@ export default {
this.transactionDate[0]=this.$route.query.StartDate;
this.transactionDate[1]=this.$route.query.StartDate;
if(this.$route.query.BankID==''){
// 费用类型:机票让费
// 费用类型:机票让费
this.msg.CostTypeID=197;
}
}
......
......@@ -528,7 +528,7 @@ tr._item_list td:last-child {
<el-option value="9" v-if="isShowType" label="酒店住宿"></el-option>
<el-option value="10" v-if="isShowType" label="景点门票"></el-option>
<el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
<el-option value="13" label="机票让"></el-option>
<el-option value="13" label="机票让"></el-option>
</el-select>
</el-form-item>
</el-col>
......@@ -698,7 +698,7 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===12" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===13" @click="goRec('RecPayQuery',rowData)">机票让{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===13" @click="goRec('RecPayQuery',rowData)">机票让{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10">{{rowData.TCNUM}}</span>
......@@ -728,7 +728,7 @@ Vue.component("TCNUMJump", {
if(rowData.DataType===12){
BankID=19;
}
// 机票让费
// 机票让费
if(rowData.DataType===13){
BankID="";
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
......
......@@ -611,7 +611,7 @@
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">成本</div>
<template v-if="IsHaveAuth">
<input type="button" value="团队让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
<input type="button" value="团队让" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="TDZR" />
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</template>
</div>
......@@ -1037,7 +1037,7 @@
</tr>
</template>
</table>
<!-- 团队让 -->
<!-- 团队让 -->
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">内部结算:
<span v-if="moneyAll.tdzryf>0 || moneyAll.tdzrsf>0">
......@@ -1058,7 +1058,7 @@
<th width="200">当前审核人</th>
</tr>
<template v-for="item in DataList.FinicePayList">
<tr v-if="isExists(item.CostTypeList,'机票让费')">
<tr v-if="isExists(item.CostTypeList,'机票让费')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1112,7 +1112,7 @@
</tr>
<template v-for="item in DataList.FinicePayList">
<tr
v-if="NotExists(item.CostTypeList,'机票让费')&&NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费(领取)') && NotExists(item.CostTypeList,'地接费(结算)') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
v-if="NotExists(item.CostTypeList,'机票让费')&&NotExists(item.CostTypeList,'签证费')&&NotExists(item.CostTypeList,'签证佣金') && NotExists(item.CostTypeList,'地接费(领取)') && NotExists(item.CostTypeList,'地接费(结算)') && NotExists(item.CostTypeList,'提成') && NotExists(item.CostTypeList,'国内联运')&& NotExists(item.CostTypeList,'车资') && NotExists(item.CostTypeList,'邀请函费用') && NotExists(item.CostTypeList,'名单表费') && NotExists(item.CostTypeList,'领队佣金') && NotExists(item.CostTypeList,'导游佣金') &&item.OrderSource!==4 && NotExists(item.CostTypeList,'国际段机票') && NotExists(item.CostTypeList,'机票退税') && NotExists(item.CostTypeList,'机票罚金') && NotExists(item.CostTypeList,'机票税金') && item.OrderSource!==11 && NotExists(item.CostTypeList,'赔偿') && NotExists(item.CostTypeList,'保险费') && NotExists(item.CostTypeList,'旅游责任险')">
<td>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
......@@ -1859,7 +1859,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
this.moneyAll.baoxiansf += item.PayMoney;
}
// 保险费
if (that.isExists(item.CostTypeList, '机票让费')) {
if (that.isExists(item.CostTypeList, '机票让费')) {
this.moneyAll.tdzryf += item.Money;
this.moneyAll.tdzrsf += item.PayMoney;
}
......@@ -1874,7 +1874,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
.CostTypeList, '国际段机票') && that.NotExists(item.CostTypeList, '机票退税') && that.NotExists(item
.CostTypeList, '机票罚金') && that.NotExists(item.CostTypeList, '机票税金') && item.OrderSource !==
11 && that.NotExists(item.CostTypeList, '赔偿') && that.NotExists(item.CostTypeList, '保险费') &&
that.NotExists(item.CostTypeList, '旅游责任险') && that.NotExists(item.CostTypeList, '机票让费')) {
that.NotExists(item.CostTypeList, '旅游责任险') && that.NotExists(item.CostTypeList, '机票让费')) {
this.moneyAll.otheryf += item.Money;
this.moneyAll.othersf += item.PayMoney;
}
......@@ -1926,7 +1926,7 @@ this.moneyAll.otheryTotalsf+=item.PayMoney;
}
});
},
//团队
//团队
TDZR() {
var TCArr = [this.TCID];
let orderObj = {
......
<template>
<div class="AppActivity Feedback">
<ul style="overflow: initial!important">
<li>
<span>
<em>公司</em>
</span>
<el-select filterable v-model="obj.branchId" >
<el-option label="不限" :value='-1'></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</li>
<li>
<span>
<em>线路</em>
</span>
<el-select filterable v-model="obj.lineId" >
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'></el-option>
</el-select>
</li>
<li>
<span>
<em>活动状态</em>
</span>
<el-select filterable v-model="obj.activityStatus" >
<el-option label="不限" :value='0'></el-option>
<el-option label="正常" :value='1'></el-option>
<el-option label="禁用" :value='2'></el-option>
<el-option label="删除" :value='3'></el-option>
</el-select>
</li>
<li style="float:right;margin-bottom:10px">
<input
type="button"
class="hollowFixedBtn"
value="查询"
@click="getList()"
>
<input
type="button"
class="hollowFixedBtn"
value="新增"
@click="addRule"
>
</li>
</ul>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>团号</th>
<th>名称</th>
<th>状态</th>
<th>类型</th>
<th>活动地址</th>
<th>描述</th>
<th>优惠金额</th>
<th>活动时间</th>
<th>满足条件</th>
<th>备注</th>
<th>积分</th>
<th>设置</th>
</tr>
<tr v-for="(item,i) in dataList" :key="i">
<td>{{item.tcid}}</td>
<td>{{item.activityName}}</td>
<td>
<span v-if="item.activityStatus==1">正常</span>
<span v-if="item.activityStatus==2">禁用</span>
<span v-if="item.activityStatus==3">删除</span>
</td>
<td>
<span v-if="item.activityType==1">满减</span>
<span v-if="item.activityType==2">立减</span>
<span v-if="item.activityType==3">秒杀</span>
<span v-if="item.activityType==4">折扣</span>
<span v-if="item.activityType==5">免减</span>
</td>
<td>{{item.activityUrl}}</td>
<td>{{item.description}}</td>
<td>{{item.discounts}}</td>
<td>
<p>开始时间:{{item.startDate | YMD}}</p>
<p>结束时间:{{item.endDate | YMD}}</p>
</td>
<td>{{item.meet}}</td>
<td>{{item.remark}}</td>
<td>{{item.returnIntegral}}倍积分</td>
<td>
<el-button @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
<!-- <el-button @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button> -->
</td>
</tr>
<tr v-if="dataList.length==0">
<td colspan="12" align="center">暂无数据</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="obj.pageSize" :total='total'>
</el-pagination>
<el-dialog
title="提成规则"
:visible.sync="ruleVisible"
width="800px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="活动名称" prop="activityName">
<el-input class="w220" v-model="form.activityName"></el-input>
</el-form-item>
<el-form-item label="活动状态" prop="activityStatus">
<el-select filterable v-model="form.activityStatus" >
<el-option label="正常" :value='1'></el-option>
<el-option label="禁用" :value='2'></el-option>
<el-option label="删除" :value='3'></el-option>
</el-select>
</el-form-item>
<el-form-item label="活动类型" prop="activityType">
<el-select filterable v-model="form.activityType" >
<el-option label="满减" :value='1'></el-option>
<el-option label="立减" :value='2'></el-option>
<el-option label="秒杀" :value='3'></el-option>
<el-option label="折扣" :value='4'></el-option>
<el-option label="免减" :value='5'></el-option>
</el-select>
</el-form-item>
<el-form-item label="活动地址" prop="activityUrl">
<el-input class="w220" v-model="form.activityUrl"></el-input>
</el-form-item>
<el-form-item label="公司" prop="branchId">
<el-select class="multiple_input" filterable v-model="form.branchId">
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select>
</el-form-item>
<el-form-item label="线路" prop="lineId">
<el-select class="multiple_input" filterable v-model="form.lineId">
<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="开始时间" prop="startDate" >
<el-date-picker type="date" v-model="form.startDate"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateBefore"></el-date-picker>
</el-form-item>
<el-form-item label="结束时间" prop="endDate">
<el-date-picker type="date" v-model="form.endDate"
value-format="yyyy-MM-dd" :picker-options="pickerBeginDateAfter"></el-date-picker>
</el-form-item>
<el-form-item label="描述">
<el-input class="w220" v-model="form.description"></el-input>
</el-form-item>
<el-form-item label="优惠金额" prop="discounts">
<el-input class="w220" @keyup.native="checkPrice(form,'discounts')" v-model="form.discounts"></el-input>
</el-form-item>
<el-form-item label="满足条件" prop="meet">
<el-input class="w220" v-model="form.meet" @keyup.native="checkInteger(form,'meet')"></el-input>
</el-form-item>
<el-form-item label="备注">
<el-input class="w220" v-model="form.remark"></el-input>
</el-form-item>
<el-form-item label="返几倍积分" prop="returnIntegral">
<el-input class="w220" @keyup.native="checkInteger(form,'returnIntegral')" v-model="form.returnIntegral"></el-input>
</el-form-item>
<el-form-item label="团号">
<el-input class="w220" v-model="form.tcid"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="ruleVisible = false">取 消</el-button>
<el-button size="small" type="danger" @click="RulesOk('form')">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
import moment from "moment"
export default {
name: 'Feedback',
data (){
let validateEach1 = (rule, value, callback) => {
if (this.form.meet =='') {
return callback(new Error('请填写满足的金额'));
}
else {
callback();
}
}
let validateEach2 = (rule, value, callback) => {
if (this.form.returnIntegral =='') {
return callback(new Error('请填写返几倍积分'));
}
else {
callback();
}
}
let validateEach3 = (rule, value, callback) => {
if (this.form.discounts =='') {
return callback(new Error('请填写优惠金额'));
}
else {
callback();
}
}
return{
allzb:100,
total:0,
obj:{
branchId:-1,
lineId:0,
activityStatus:0,
pageIndex:1,
pageSize:10,
},
dataList:[],
loading:false,
dateList:[],
LineList:[],
companyList:[],
ruleVisible:false,
form:{
activityName:"",
activityStatus:1,
activityType:"",
activityUrl:'',
branchId:'',
description:'',
discounts:'',
startDate:'',
endDate:'',
groupId:'',
id:'',
lineId:'',
meet:'',
remark:'',
returnIntegral:'',
tcid:'',
},
LineTeamList:[],
EmployeeList:[],
rules:{
activityName: [{ required: true, message: '请输入活动名称', trigger: 'blur' }],
activityStatus: [{ required: true, message: '请选择活动状态', trigger: 'change' }],
activityType: [{ required: true, message: '请选择活动类型', trigger: 'change' }],
branchId: [{ required: true, message: '请选择公司', trigger: 'change' }],
// discounts: [{ required: true, message: '请输入优惠金额', trigger: 'blur' }],
startDate: [{ required: true, message: '请选择开始日期', trigger: 'change' }],
endDate: [{ required: true, message: '请选择结束日期', trigger: 'change' }],
lineId: [{ required: true, message: '请选择线路', trigger: 'change' }],
tcid: [{ required: true, message: '请输入团号', trigger: 'blur' }],
meet:[{ validator: validateEach1, trigger: "blur",required: true, }],
returnIntegral:[{ validator: validateEach2, trigger: "blur",required: true, }],
discounts:[{ validator: validateEach3, trigger: "blur",required: true, }],
},
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.form.endDate)
return endTime.getTime() < time.getTime()
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.form.startDate)
return startTime.getTime() >= time.getTime()
}
}
}
},
created(){
this.getCompany();
let userInfo = this.getLocalStorage();
this.form.groupId=userInfo.RB_Group_id;
},
mounted(){
this.getList();
this.getEmployeeList();
this.getLineList();
},
filters:{
YMD(date){
return moment(date).format("YYYY-MM-DD");
}
},
methods:{
handleCurrentChange(val) {
this.obj.pageIndex = val;
this.getList();
},
getCompany() {
this.apipost(
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
} else {
}
},
err => {}
);
},
Delete(item) {
this.$confirm("是否删除? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apipost('OPCommission_RemoveOPCommission', {ID:item.Id}, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message)
this.getList()
}else{
this.Error(res.data.message)
}
})
})
.catch(() => {});
},
addRule(){
this.ruleVisible=true;
},
SetRules(item){
this.ruleVisible=true;
this.form=item;
this.form.endDate=moment(item.endDate).format("YYYY-MM-DD")
this.form.startDate=moment(item.startDate).format("YYYY-MM-DD")
},
RulesOk(formName){
this.$refs[formName].validate((valid) => {
if (valid) {
this.apiJavaPost(
"/api/appActivity/doUpdateOrSave",
this.form,
res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message)
this.getList();
this.ruleVisible=false;
this.form={
activityName:"",
activityStatus:1,
activityType:"",
activityUrl:'',
branchId:'',
description:'',
discounts:'',
startDate:'',
endDate:'',
groupId:'',
id:'',
lineId:'',
meet:'',
remark:'',
returnIntegral:'',
tcid:'',
}
} else {
this.Error(res.data.message);
}
},
null
);
} else {
}
});
},
getEmployeeList () {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
IsLeave: '0'
}
this.apipost(
'admin_get_EmployeeGetList', {},
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data
}
},
err => {
}
)
},
getLineList() {
this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
});
},
getDepart(id){
this.form.DepartmentId= id;
this.$forceUpdate();
},
getList(){
this.loading=true;
this.apiJavaPost(
"/api/appActivity/getAPPActivityList",
this.obj,
res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
this.total=res.data.data.count;
console.log("this.dataList", this.dataList)
} else {
this.Error(res.data.message);
}
},
null
);
},
}
}
</script>
<style>
.AppActivity .el-form-item{
display: inline-block;
}
.Feedback ul>li{
display: inline-block;
font-size: 12px;
color: #666;
margin: 20px 30px 0px 0;
}
.Feedback .singeRowTable{
margin-top: 20px;
}
</style>
......@@ -136,6 +136,7 @@
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('active.cl_addPp')}}</th>
<th>换购价</th>
<th>活动时间</th>
<th>备注</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
......@@ -177,6 +178,10 @@
</td>
<td>{{item.createUserName}}</td>
<td>{{item.redemptionPrice}}</td>
<td>
<p>开始时间:{{item.activityStartDate}}</p>
<p>结束时间:{{item.activityEndDate}}</p>
</td>
<td>{{item.remark}}</td>
<td class="text_al_left">
<!-- <el-button-group> -->
......
......@@ -3798,6 +3798,14 @@ export default {
title: '优惠券列表'
}
},
{
path: '/AppActivityExclusive',
name: 'AppActivityExclusive',
component: resolve => require(['@/components/activity/AppActivityExclusive'], resolve),
meta: {
title: 'APP专享活动'
}
},
{
path: '/CouponDetail',
name: 'CouponDetail',
......
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