Skip to content

S
SuperMan
Commit d3b1ff75 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 328ab8c7 7bfb3e5b
Show whitespace changes
Inline Side-by-side
Showing with 3396 additions and 2960 deletions
src/assets/common/lang/zh.js
View file @ d3b1ff75
......@@ -768,6 +768,9 @@ export const active = {
cjjiangxiang: '抽奖奖项',
cl_man: '满',
cl_keyong: '可用',
cl_cjleixing: '抽奖类型',
cl_huodong: '活动',
cl_renwu: '任务',
}
export const fnc = {
......@@ -1737,3 +1740,5 @@ export const visaT = {
qxzxybddry:"请选择需要绑定的人员",
v_Othervisas:'其他'
}
import invoicesManager from './H/h-invoicesManager'
export const invoices = invoicesManager
\ No newline at end of file
src/components/Complaints/ComplaintsDetail.vue
View file @ d3b1ff75
......@@ -236,7 +236,7 @@
</li>
<li
v-if="ComplainInfo.DisposeStatus===4&&(getLocalStorage().EmployeeId===ComplainDetial[ComplainDetial.length-1].CreateBy||authority.indexOf('S_Complain_Finance')!=-1)">
<span>赔偿列表：</span>
<span>立即制单：</span>
<span v-for="compensation in ComplainCompensation" class="CD_dealResult" href="javascript:void(0)"
@click="setFinance(compensation)">{{compensation.CompensateMoney}}</span>
</li>
......@@ -593,6 +593,7 @@
},
//设置财务单据
setFinance (compensation) {
let id = [11];
//TODO跳转到财务单据
if (compensation.FinanceID === 0) {
var TCArr = [this.PriceInfo.TCID]
......@@ -607,6 +608,7 @@
name: 'ChoiceAddFinancialDocuments',
query: {
Type: 2,
templateID: JSON.stringify(id),
companyID: this.PriceInfo.OutBranchId,
'blank': 'y',
'orderObj': JSON.stringify(orderObj)
......
src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue
View file @ d3b1ff75
......@@ -85,6 +85,7 @@
lastID:-1,
orderObj:null,
showTab:0,
templateID: null,
}
},methods:{
goUrl(path,id,Name,Type,IsUploadPic) {
......@@ -121,6 +122,18 @@
}else{
this.noData = false;
}
let newList = [];
if (this.templateID) {
this.templateID.forEach(x=>{
this.GetList.forEach(y=>{
if(x === y.Id) {
newList.push(y)
}
})
})
this.GetList = newList
}
},
Financial_post_GetList(){ //获取
this.apipost('Financial_post_GetList',{},res=>{
......@@ -131,13 +144,13 @@
if(x.Type==1){
this.collectList.push(x);
}else if (x.Type==2){
if(this.active===2){
if(x.Id!=11){
this.payList.push(x);
}
}else{
// if(this.active===2){
// if(x.Id!=11){
// this.payList.push(x);
// }
// }else{
this.payList.push(x);
}
// }
}else if (x.Type==7){
this.GZList.push(x);
}
......@@ -156,6 +169,7 @@
},err=>{})
},
},mounted(){
this.templateID = this.$route.query.templateID ? JSON.parse(this.$route.query.templateID) : null
this.Financial_post_GetList();
this.showTab = this.$route.query.Type?this.$route.query.Type:0;
if(this.showTab==1){
......
src/components/FinancialModule/RecPayQuery.vue
View file @ d3b1ff75
......@@ -918,7 +918,7 @@ export default {
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
if(!this.msg.TemplateId)this.msg.TemplateId=0;
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-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;
......@@ -958,7 +958,7 @@ export default {
if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
if(!this.msg.TemplateId)this.msg.TemplateId=0;
if(!this.msg.RB_Branch_Id)this.msg.RB_Branch_Id=-1;
if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-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;
......
src/components/SalesModule/CustomerCertification.vue 0 → 100644
View file @ d3b1ff75
<template>
<div class="CertificationDetail">
<div>
<div
:class="{salesApprovalLayercontentDiv:showlayer,rightZero:isTransition}"
class="ownScrollbarStyle"
@click.stop
>
<div class="title">实名认证详情</div>
<div class="list">
<div class="itemAnswer" v-show="answerDetailList.length>0">
<div class="item" v-for="item in answerDetailList">
<div class="topMsg">
<!-- <img v-if="!item.photo" src="../../assets/img/litheader.png">
<img v-if="item.photo" :onerror="defaultImg" :src="item.photo"> -->
<p>{{item.CustomerName}}</p>
<p class="mt5">
<i class="iconfont icon-img_dianhua fz12" style="color: #09d49d;"></i>
<span class="fz14 color333">{{item.Customer}}</span>
&nbsp;&nbsp;&nbsp;
<span
class="fz14 color333"
>{{item.ContactPhone}}</span>
</p>
<p class="fz12 color999 mt5">{{item.Addres}}</p>
</div>
<p class="fz16 color666">
<i class="iconfont icon-ico-renwuyaoqiu fz14 color999"></i>&nbsp;认证信息
</p>
<div class="salesApprovalLayercontentBtn">
<p class="fz12 color999 mt5">认证方式：{{item.ApplyType==1?"三证合一":"身份证+名片"}}</p>
<p class="fz12 color999 mt5">申请时间：{{item.CreateDateStr}}</p>
<div v-if="item.CertificationPics&&item.CertificationPics.length>0">
<div v-for="picItem in item.CertificationPics"> <img v-if="!picItem" src="../../assets/img/litheader.png">
<img v-if="picItem" :onerror="defaultImg" :src="picItem"></div>
</div>
<div>
<span class="fz14 color333">审批意见</span>
</div>
<p class="mt20">
<el-input type="textarea" v-model="Reason"></el-input>
</p>
<input type="button" class="normalBtn mt20 fr" value="通过" @click="saveIdea(item,1)">
<input type="button" class="normalBtn mt20 fr" value="拒绝" @click="saveIdea(item,2)">
<span class="fr cursorpointer colorE95252" @click="closeLayer">取消</span>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="query-box" style="border: none;">
<ul>
<!-- <li><span><em>姓名</em></span>
<el-input v-model='msg.CustomerName'></el-input>
</li>
-->
<li>
<span>
<em>申请时间</em>
</span>
<el-date-picker
v-model="msg.SDate"
@change="dataDui()"
class="w135"
value-format="yyyy-MM-dd"
type="date"
></el-date-picker>-
<el-date-picker
v-model="msg.EDate"
@change="dataDui()"
class="w135"
value-format="yyyy-MM-dd"
type="date"
></el-date-picker>
</li>
<li>
<span>
<em>状态</em>
</span>
<el-select v-model="msg.MarkOverType">
<el-option label="不限" value="-1" key="-1"></el-option>
<el-option label="申请中" value="0" key="0"></el-option>
<el-option label="通过" value="1" key="1"></el-option>
<el-option label="拒绝" value="2" key="2"></el-option>
</el-select>
</li>
<li>
<input
type="button"
class="hollowFixedBtn"
value="查询"
@click="resetPageIndex(),getList()"
>
</li>
</ul>
</div>
<table
class="publicCustomerTable"
border="0"
cellspacing="0"
cellpadding="0"
v-loading="loading"
>
<tr>
<th width="20%">门店名称</th>
<th width="10%">联系人</th>
<th width="10%">电话</th>
<th width="10%">地址</th>
<th width="10%">申请时间</th>
<th width="10%">操作</th>
</tr>
<tr>
<td colspan="6" align="center" v-show="list.length==0">暂无数据</td>
</tr>
<tr v-for="(item,index) in list">
<td>{{item.CustomerName}}</td>
<td>{{item.Customer}}</td>
<td>{{item.ContactPhone}}</td>
<td>{{item.Addres}}</td>
<td>{{item.CreateDateStr}}</td>
<td>
<input
type="button"
value="查看详情"
class="normalBtn"
style="margin-left: 0;"
@click="getDetail(item)"
>
</td>
</tr>
</table>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize"
:total="total"
></el-pagination>
</div>
</template>
<script>
export default {
data() {
return {
layerShow: false,
msg: {
pageIndex: 1,
pageSize: 10,
SDate: "",
EDate: "",
ApplyState: "-1"
},
Reason:"",
showlayer: false,
loading: false,
isTransition: false,
currentPage: 1,
total: 0,
answerDetailList: [],
list: []
};
},
methods: {
// 结束日期不能大于开始日期
dataDui() {
if (this.msg.SDate > this.msg.EDate && this.msg.EDate !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.EDate = "";
}
},
closeLayer() {
let _this = this;
setTimeout(function() {
_this.showlayer = false;
}, 300);
this.isTransition = false;
this.Reason= "";
},
saveIdea(obj,applyState) {
console.log(obj,"sdsdsd");
obj.applyState=applyState;
obj.Reason=this.Reason;
this.apipost(
"app_customer_UpdateCertification",
obj,
res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
this.closeLayer();
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
getList() {
this.loading = true;
this.apipost(
"app_customer_GetCertificationPageList",
this.msg,
res => {
if (res.data.resultCode == 1) {
this.loading = false;
this.list = res.data.data.pageData;
this.total = res.data.data.count;
} else {
this.$message.error(res.data.message);
this.loading = false;
}
},
err => {}
);
},
closeLayer() {
let _this = this;
setTimeout(function() {
_this.showlayer = false;
}, 300);
this.isTransition = false;
this.Reason=''
},
getDetail(obj) {
this.showlayer = true;
this.isTransition = true;
this.apipost(
"app_customer_GetCertificationModel",
{ ID: obj.ID },
res => {
if (res.data.resultCode == 1) {
this.answerDetailList = res.data.data;
this.Reason = this.answerDetailList[0].Reason;
} else {
this.$message.error(res.data.message);
}
},
err => {}
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
}
},
mounted() {
this.getList();
}
};
</script>
<style>
.CertificationDetail {
overflow-x: hidden;
}
.CertificationDetail .title {
width: 420px;
height: 48px;
line-height: 48px;
text-indent: 20px;
font-size: 16px;
color: #333;
}
.CertificationDetail .list .item {
width: 380px;
height: auto;
overflow: hidden;
border: 1px solid #e6e6e6;
margin: 20px 0 20px 20px;
padding: 20px;
}
.CertificationDetail .list .item .topMsg {
overflow: hidden;
padding-bottom: 20px;
border-bottom: 1px solid #e6e6e6;
}
.CertificationDetail .list .item .topMsg > img {
float: left;
margin-right: 13px;
}
.CertificationDetail .list .item .topMsg .newGuest {
width: 50px;
height: 18px;
text-align: center;
font-size: 14px;
color: #257bf1;
background: #dae4ff;
}
.CertificationDetail .list .item .bottomMsg {
padding: 15px 0;
}
.CertificationDetail .list .itemAnswer {
width: 380px;
height: auto;
margin: 20px 0 20px 20px;
padding: 20px;
background: #ebf0ff;
}
.CertificationDetail .list .itemAnswer .answerItem {
border-bottom: 1px solid #bcc0cc;
overflow: hidden;
padding: 15px 0;
}
.CertificationDetail .list .itemAnswer .answerItem > img {
float: left;
width: 24px;
height: 24px;
border-radius: 12px;
margin-right: 10px;
}
.publicCustomerTable {
width: 100%;
font-size: 14px;
color: #333;
border: 1px solid #dcdcdc;
box-sizing: border-box;
border-bottom: none;
border-right: none;
}
.publicCustomerTable tr th {
background: #dcdcdc;
height: 30px;
font-size: 12px;
text-align: left;
text-indent: 25px;
}
.publicCustomerTable tr {
text-align: left;
}
.publicCustomerTable tr:nth-child(2n) {
background: #f2f2f2;
}
.publicCustomerTable tr:nth-child(2n + 1) {
background: #ffffff;
}
.publicCustomerTable tr:hover {
background: #d0d2d9;
}
.publicCustomerTable tr td {
height: 40px;
padding-left: 25px;
border-bottom: 1px solid #dcdcdc;
font-size: 14px;
color: #333;
border-right: 1px solid #dcdcdc;
}
.pd20 {
padding: 12px 20px !important;
}
.el-popper[x-placement^="bottom"] {
margin-top: 0px !important;
}
.el-popper[x-placement^="top"] {
margin-bottom: 0px !important;
}
.CertificationDetail .ownScrollbarStyle {
width: 0px;
position: absolute;
right: 0;
background-color: white;
transition: all linear 0.5s;
height: 100%;
overflow: hidden;
}
.salesApprovalLayercontentDiv {
width: 450px !important;
}
</style>
\ No newline at end of file
src/components/SalesModule/MyCustomer.vue
View file @ d3b1ff75
......@@ -65,7 +65,9 @@
.page_MyCustomerSearch li>span {display: inline-block; }
.page_MyCustomerSearch li span>em{display: inline-block; min-width: 60px; text-align: right; font-style: normal; margin:0 12px 0 0;}
.page_MyCustomerSearch li:last-child{float: right;}
.page_MyCustomerSearch ._class_b{
color: #257BF1 !important
}
</style>
<template>
<div class="page_MyCustomer">
......@@ -106,7 +108,7 @@
<img v-if='item.icon' :onerror="defaultImg" :src='item.icon'/>
<p>{{item.contact}}</p>
<p><i class="iconfont icon-img_dianhua"></i>{{item.contactNumber}}</p>
<p class="_addr">{{item.customerName}}</p>
<p class="_addr">{{item.customerName}} <i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></p>
</div>
<div class="_record" v-if="item.customerAccountId!=0">
<p class="_fist_n" v-if="item.customerVisitList.length>0">近期约访：{{item.customerVisitList[0].visitDateTime}}</p>
......
src/components/SalesModule/customerApproval.vue
View file @ d3b1ff75
......@@ -27,7 +27,9 @@
.customerApprovalLayercontentBtn>span.cked{border:2px solid #E95252;box-sizing: border-box;}
.customerApprovalLayercontentBtn>span>img{float: left; margin:10px 23px; width: 63px; height: 63px;}
.customerApproval .lastVisitContent{background: #f5f5f5; font-size: 12px; padding: 5px 12px; margin-top: 8px;}
.customerApproval ._class_b{
color: #257BF1 !important
}
</style>
<template>
......@@ -197,7 +199,7 @@
<th width="15%">操作</th>
</tr>
<tr v-for="item in list">
<td class="fz16">{{item.customerName}}</td>
<td class="fz16">{{item.customerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></td>
<td>
{{item.contact}}
</td>
......
src/components/SalesModule/customerTransfer.vue
View file @ d3b1ff75
......@@ -115,7 +115,7 @@
@change="ckeckedOne"
style="vertical-align: middle;"
>
{{item.CustomerName}}
{{item.CustomerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i>
</label>
</td>
<td>{{item.Contact}}</td>
......@@ -1045,6 +1045,9 @@ export default {
box-sizing: border-box;
border-bottom: none;
border-right: none;
}
.customerTransferTable ._class_b{
color: #257BF1 !important
}
.customerTransferTable tr th {
background: #dcdcdc;
......
src/components/SalesModule/publicCustomer.vue
View file @ d3b1ff75
......@@ -54,13 +54,13 @@
<th width="20%">
<label><input type="checkbox" v-model="isCkedAll" @click='checkedAll()' style="vertical-align: middle;"/>门店名称</label>
</th>
<th width="10%">联系电话</th>
<th width="17%">联系电话</th>
<th width="20%">地址</th>
<th width="10%">来源</th>
<th width="10%">拜访次数</th>
<th width="8%">拜访次数</th>
<th width="10%">交易金额</th>
<th width="10%">创建人</th>
<th width="10%">操作</th>
<th width="5%">操作</th>
</tr>
<tr>
<td colspan="8" align="center" v-show='list.length==0'>
......@@ -69,7 +69,7 @@
</tr>
<tr v-for='(item,index) in list'>
<td>
<label><input type="checkbox" :value="item.CustomerId" v-model="customerList" @change="ckeckedOne" style="vertical-align: middle;"/>{{item.CustomerName}}</label>
<label><input type="checkbox" :value="item.CustomerId" v-model="customerList" @change="ckeckedOne" style="vertical-align: middle;"/>{{item.CustomerName}}<i class="iconfont icon-shimingrenzheng" :class="{'_class_b': item.RealNameAuthentication===1}"></i></label>
</td>
<td><i class="iconfont icon-img_dianhua fz14" style="color:#09D49D;margin-right: 5px;"></i>{{item.ContactNumber}}</td>
<td>{{item.Address}}</td>
......@@ -249,4 +249,7 @@
.pd20{padding: 12px 20px !important; }
.el-popper[x-placement^=bottom]{margin-top: 0px !important;}
.el-popper[x-placement^=top]{margin-bottom: 0px !important;}
.publicCustomerTable ._class_b{
color: #257BF1 !important
}
</style>
\ No newline at end of file
src/components/activity/CouponList.vue
View file @ d3b1ff75
......@@ -98,6 +98,7 @@
<th>{{$t('active.cl_couponNum')}}</th>
<th>{{$t('active.cl_ffzongliang')}}</th>
<th>{{$t('active.ad_endNum')}}</th>
<th>{{$t('fnc.sygongsi')}}</th>
<th>{{$t('system.query_lineName')}}</th>
<th>{{$t('active.ad_xlmc')}}</th>
<th>{{$t('system.query_type')}}</th>
......@@ -119,6 +120,7 @@
<span class="_couponReceiveCount" @click="item.couponReceiveCount === 0 ? '' : goDetail('CouponDetail', item)">{{item.couponReceiveCount}}</span>
</td>
<td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }}</td>
<td>{{item.branchName}}</td>
<td>{{item.lineId <= 0 ? $t('pub.unlimitedSel') : item.lineName}}</td>
<td>{{item.lineteamId <= 0 ? $t('pub.unlimitedSel') : item.lineTeamName}}</td>
<td>{{item.couponsType ===1 ? $t('active.cl_dyquan') : $t('active.cl_zkquan')}}</td>
......@@ -191,6 +193,7 @@
v-model="addMsg.branchId"
:placeholder="$t('system.ph_choice')"
>
<el-option :label="$t('system.ph_buxian')" :value="-1" :key="-1"></el-option>
<el-option
v-for="item in layerCompanyList"
:label="item.BName"
......
src/components/activity/LuckyDraw.vue
View file @ d3b1ff75
......@@ -133,6 +133,7 @@
<tr>
<th>{{$t('active.ld_name')}}</th>
<th>{{$t('admin.admin_company')}}</th>
<th>{{$t('active.cl_cjleixing')}}</th>
<th>{{$t('active.ld_cjcs')}}</th>
<th>{{$t('hotel.hotel_StartDate')}}</th>
<th>{{$t('hotel.hotel_EndDate')}}</th>
......@@ -143,6 +144,7 @@
<tr v-for="item in dataList">
<td>{{item.lotteryName}}</td>
<td>{{item.branchName}}</td>
<td>{{item.lotteryType === 1 ? $t('active.cl_huodong') : $t('active.cl_renwu')}}</td>
<td>{{item.lotteryCount}}</td>
<td>{{item.startDate}}</td>
<td>{{item.endDate}}</td>
......@@ -206,7 +208,17 @@
</el-form-item>
</td>
<td>
<el-form-item :label="$t('system.table_company')" prop="branchId">
<el-form-item label="抽奖类型" prop="lotteryType">
<el-select filterable class="w217" v-model="addMsg.lotteryType" :placeholder="$t('system.ph_choice')" @change="addMsg.branchId = ''">
<el-option :label="$t('active.cl_huodong')" :value="1" :key="1"></el-option>
<el-option :label="$t('active.cl_renwu')" :value="2" :key="2"></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('system.table_company')" prop="branchId" v-if="addMsg.lotteryType === 1">
<el-select filterable class="w217" v-model="addMsg.branchId" :placeholder="$t('system.ph_choice')">
<el-option
v-for="item in companyList"
......@@ -216,21 +228,17 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('system.table_company')" prop="branchId" v-else>
<el-select filterable class="w217" v-model="addMsg.branchId" :placeholder="$t('system.ph_choice')">
<el-option label="不限" :value="-1" :key="-1"></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<td>
<el-form-item :label="$t('active.ld_cjNum')" prop="lotteryCount">
<el-input v-model="addMsg.lotteryCount" class="w217" @keyup.native="checkInteger(addMsg,'lotteryCount')" :placeholder="$t('active.ld_cjNum')"/>
</el-form-item>
</td>
<td>
<el-form-item :label="$t('active.ld_status')" prop="lotteryStatus">
<el-select filterable v-model="addMsg.lotteryStatus" class="w217">
<el-option :label="$t('pub.normalSel')" :value="1"></el-option>
<el-option :label="$t('active.ld_jinyong')" :value="2"></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td>
......@@ -247,6 +255,16 @@
</el-form-item>
</td>
</tr>
<tr>
<td>
<el-form-item :label="$t('active.ld_status')" prop="lotteryStatus">
<el-select filterable v-model="addMsg.lotteryStatus" class="w217">
<el-option :label="$t('pub.normalSel')" :value="1"></el-option>
<el-option :label="$t('active.ld_jinyong')" :value="2"></el-option>
</el-select>
</el-form-item>
</td>
</tr>
<tr>
<td colspan="2">
<el-form-item :label="$t('active.ld_cjRule')" prop="lotteryRules">
......@@ -331,6 +349,7 @@ export default {
lotteryPlatform:1,
lotteryRules:'',
image:'',
lotteryType: 1,
},
toolbar: {
clean: true, //加粗
......@@ -357,6 +376,7 @@ export default {
lotteryCount: [{ required: true, message: "请输入抽奖次数", trigger: "blur" }],
startDate: [{ required: true, message: "请选择开始日期", trigger: "blur" }],
endDate: [{ required: true, message: "请选择结束日期", trigger: "blur" }],
lotteryType: [{ required: true, message: "请选择抽奖类型", trigger: "blur" }],
},
loading:false,
currentPage: 1,
......@@ -406,6 +426,7 @@ export default {
lotteryPlatform:1,
lotteryRules:'',
image:'',
lotteryType: '',
}
this.addMsg= newMsg;
},
......@@ -484,8 +505,9 @@ export default {
this.addMsg.groupId = item.groupId;
this.addMsg.branchId = item.branchId;
this.addMsg.lotteryStatus = item.lotteryStatus;
this.addMsg.lotteryRules = item.lotteryRules,
this.addMsg.lotteryRules = item.lotteryRules
this.addMsg.image = item.image
this.addMsg.lotteryType = item.lotteryType
},
// 删除抽奖
deleteItem: function (item) {
......@@ -515,6 +537,7 @@ export default {
name: 'awardList',
query: {
lotteryId: item.id,
branchId: item.branchId,
blank: "y",
tab: this.$t('active.cjjiangxiang')
}
......
src/components/activity/awardList.vue
View file @ d3b1ff75
......@@ -193,7 +193,6 @@ export default {
},
//修改信息
updateData(item){
console.log(item);
this.addMsg.id=item.id;
this.addMsg.lotteryId = item.lotteryId;
this.addMsg.awardName = item.awardName;
......@@ -206,8 +205,7 @@ export default {
},
//根据奖项类型请求关联Id
getAwardRelationId(id){
let userInfo = localStorage.userInfo ? JSON.parse(localStorage.userInfo) : '';
let branchId = userInfo.RB_Branch_id ? userInfo.RB_Branch_id : 0
let branchId = this.$route.query.branchId;
if(id==3){
let msg = {
couponId:this.addMsg.awardRelationId,
......
src/router/config.js
View file @ d3b1ff75
......@@ -627,7 +627,7 @@ export default {
meta: {
title: '酒店核算详情'
},
},{
}, {
path: '/HotelQueryList', //酒店查询统计
name: 'HotelQueryList',
component: resolve => require(['@/components/Hotel/HotelQueryList'], resolve),
......@@ -1062,8 +1062,7 @@ export default {
meta: {
title: '散客机票'
},
},
,{
}, , {
path: '/IndividualTicketOrder', //散客今日机票订单
name: 'IndividualTicketOrder',
component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
......@@ -1078,7 +1077,7 @@ export default {
meta: {
title: '散客机票订单详情'
},
},{
}, {
path: '/PassengerList', //旅客名单
name: 'PassengerList',
component: resolve => require(['@/components/Ticketing/PassengerList'], resolve),
......@@ -1086,7 +1085,7 @@ export default {
title: '旅客名单'
},
}, {
path: '/ThroughSetting',//机票联运
path: '/ThroughSetting', //机票联运
name: 'ThroughSetting',
component: resolve => require(['@/components/Ticketing/ThroughSetting'], resolve),
meta: {
......@@ -1094,7 +1093,7 @@ export default {
},
},
{
path: '/TicketTransport',//机票联运2
path: '/TicketTransport', //机票联运2
name: 'TicketTransport',
component: resolve => require(['@/components/Ticketing/TicketTransport'], resolve),
meta: {
......@@ -1281,7 +1280,7 @@ export default {
title: '车控列表'
},
}, {
path: '/BusInfo',//添加修改车控页面
path: '/BusInfo', //添加修改车控页面
name: 'BusInfo',
component: resolve => require(['@/components/busManagement/BusInfo'], resolve),
meta: {
......@@ -1289,7 +1288,7 @@ export default {
},
},
{
path: '/busStatistics',//添加修改车控页面
path: '/busStatistics', //添加修改车控页面
name: 'busStatistics',
component: resolve => require(['@/components/busManagement/busStatistics'], resolve),
meta: {
......@@ -1311,7 +1310,7 @@ export default {
title: '派车安排'
},
}, {
path: '/busAccounting',//车控内部核算
path: '/busAccounting', //车控内部核算
name: 'busAccounting',
component: resolve => require(['@/components/busManagement/busAccounting'], resolve),
meta: {
......@@ -1319,7 +1318,7 @@ export default {
},
},
{
path: '/busMonthStatistics',//车月统计
path: '/busMonthStatistics', //车月统计
name: 'busMonthStatistics',
component: resolve => require(['@/components/busManagement/busMonthStatistics'], resolve),
meta: {
......@@ -1327,7 +1326,7 @@ export default {
},
},
{
path: '/busAccountInfo',//车控内部核算详情
path: '/busAccountInfo', //车控内部核算详情
name: 'busAccountInfo',
component: resolve => require(['@/components/busManagement/busAccountInfo'], resolve),
meta: {
......@@ -1341,7 +1340,7 @@ export default {
title: '车控看板'
},
}, {
path: '/busUsePrice',//车辆报价
path: '/busUsePrice', //车辆报价
name: 'busUsePrice',
component: resolve => require(['@/components/busManagement/busUsePrice'], resolve),
meta: {
......@@ -1354,50 +1353,50 @@ export default {
meta: {
title: '车资分摊管理'
},
},{
path: '/visaList',//签证列表
}, {
path: '/visaList', //签证列表
name: 'visaList',
component: resolve => require(['@/components/VisaCenter/visaList'], resolve),
meta: {
title: '签证列表'
},
}, {
path: '/visaList2',//签证列表2
path: '/visaList2', //签证列表2
name: 'visaList2',
component: resolve => require(['@/components/VisaCenter/visaList2'], resolve),
meta: {
title: '签证列表'
},
}, {
path: '/VisaManagement',//签证管理
path: '/VisaManagement', //签证管理
name: 'VisaManagement',
component: resolve => require(['@/components/VisaCenter/VisaManagement'], resolve),
meta: {
title: '签证管理'
},
}, {
path: '/VisaAccounting',//签证核算
path: '/VisaAccounting', //签证核算
name: 'VisaAccounting',
component: resolve => require(['@/components/VisaCenter/VisaAccounting'], resolve),
meta: {
title: '签证核算'
},
}, {
path: '/addVisa',//签证添加
path: '/addVisa', //签证添加
name: 'addVisa',
component: resolve => require(['@/components/VisaCenter/addVisa'], resolve),
meta: {
title: '签证添加'
},
}, {
path: '/visaComList',//签证已确认
path: '/visaComList', //签证已确认
name: 'visaComList',
component: resolve => require(['@/components/VisaCenter/visaComList'], resolve),
meta: {
title: '签证已确认'
},
}, {
path: '/seeVisa',//签证已确认
path: '/seeVisa', //签证已确认
name: 'seeVisa',
component: resolve => require(['@/components/VisaCenter/seeVisa'], resolve),
meta: {
......@@ -1443,7 +1442,7 @@ export default {
title: '团控配置'
},
}, {
path: '/TravelControlList',//团控列表
path: '/TravelControlList', //团控列表
name: 'TravelControlList',
component: resolve => require(['@/components/TravelManager/TravelList/TravelControlList'], resolve),
meta: {
......@@ -1451,23 +1450,23 @@ export default {
},
},
{
path:'/oneDayTrip', //一日游
name:'oneDayTrip',
path: '/oneDayTrip', //一日游
name: 'oneDayTrip',
component: resolve => require(['@/components/TravelManager/TravelList/oneDayTrip'], resolve),
meta: {
title: '一日游'
},
},
{
path:'/oneDayTrip2', //一日游销售自主开团用
name:'oneDayTrip2',
path: '/oneDayTrip2', //一日游销售自主开团用
name: 'oneDayTrip2',
component: resolve => require(['@/components/TravelManager/TravelList/oneDayTrip'], resolve),
meta: {
title: '一日游'
},
},
{
path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
path: '/priceIncomeConfirmInfo', ///priceIncomeConfirmInfo
name: 'priceIncomeConfirmInfo',
component: resolve => require(['@/components/TravelManager/TravelList/priceIncomeConfirmInfo'], resolve),
meta: {
......@@ -1496,7 +1495,7 @@ export default {
meta: {
title: '一日游行程列表'
},
},{ //行程列表
}, { //行程列表
path: '/SaleTripList',
name: 'SaleTripList',
component: resolve => require(['@/components/TravelManager/TravelList/SaleTripList'], resolve),
......@@ -1504,14 +1503,14 @@ export default {
title: '销售行程列表'
},
}, {
path: '/GroupAdvertising',//团期广告
path: '/GroupAdvertising', //团期广告
name: 'GroupAdvertising',
component: resolve => require(['@/components/TravelManager/TravelList/GroupAdvertising'], resolve),
meta: {
title: '团期广告'
},
}, {
path: '/TeamBalancePayment',//团队收支
path: '/TeamBalancePayment', //团队收支
name: 'TeamBalancePayment',
component: resolve => require(['@/components/TravelManager/TravelList/TeamBalancePayment'], resolve),
meta: {
......@@ -1549,7 +1548,7 @@ export default {
title: '领队管理'
},
}, {
path: '/LeaderSpendMoney',//领队用款
path: '/LeaderSpendMoney', //领队用款
name: 'LeaderSpendMoney',
component: resolve => require(['@/components/TravelManager/TravelLeader/LeaderSpendMoney'], resolve),
meta: {
......@@ -1763,7 +1762,7 @@ export default {
meta: {
title: '签证办理'
},
},{ // 签证中心 签证财务单据
}, { // 签证中心 签证财务单据
path: '/VisaFinancialDocuments',
name: 'VisaFinancialDocuments',
component: resolve => require(['@/components/SalesModule/VisaFinancialDocuments'], resolve),
......@@ -1868,6 +1867,13 @@ export default {
meta: {
title: '路线'
},
}, { //财务 现金账户
path: '/CustomerCertification',
name: 'CustomerCertification',
component: resolve => require(['@/components/SalesModule/CustomerCertification'], resolve),
meta: {
title: '现金账户'
},
},
{ // 销售 我的任务
path: '/mySaleTaskManagement',
......@@ -2014,7 +2020,7 @@ export default {
title: '自主开团- 销售'
},
}, {
path: '/MakeQuotation',//制作报价单
path: '/MakeQuotation', //制作报价单
name: 'MakeQuotation',
component: resolve => require(['@/components/TravelManager/TravelQuotationCenter/MakeQuotation'], resolve),
meta: {
......@@ -2069,7 +2075,7 @@ export default {
},
},
{
path: '/ChangeHotel',//酒店变更
path: '/ChangeHotel', //酒店变更
name: 'ChangeHotel',
component: resolve => require(['@/components/Hotel/ChangeHotel'], resolve),
meta: {
......@@ -2123,7 +2129,7 @@ export default {
},
},
{
path: '/TravelPreview',//行程预览
path: '/TravelPreview', //行程预览
name: 'TravelPreview',
component: resolve => require(['@/components/TravelManager/TravelPreview'], resolve),
meta: {
......@@ -2158,15 +2164,14 @@ export default {
meta: {
title: '账户类型'
},
},{ //少价管理
}, { //少价管理
path: '/LessPriceManagement',
name: 'LessPriceManagement',
component: resolve => require(['@/components/systemManagement/LessPriceManagement'], resolve),
meta: {
title: '少价管理'
}
},
,{ // 财务往来单据 收入确认单
}, , { // 财务往来单据 收入确认单
path: '/priceIncomeConfirmList',
name: 'priceIncomeConfirmList',
component: resolve => require(['@/components/FinancialModule/priceIncomeConfirmList'], resolve),
......@@ -2503,7 +2508,7 @@ export default {
meta: {
title: '简易报表'
},
},{ //财务 报表 年度营收报表
}, { //财务 报表 年度营收报表
path: '/YearReport',
name: 'YearReport',
component: resolve => require(['@/components/FinancialModule/ReportForm/YearReport'], resolve),
......@@ -2525,7 +2530,7 @@ export default {
meta: {
title: '单据明细'
},
},{ // 销售 制作广告
}, { // 销售 制作广告
path: '/advert',
name: 'advert',
component: resolve => require(['@/components/SalesModule/advert'], resolve),
......@@ -2674,7 +2679,7 @@ export default {
},
},
{
path: '/advmanager',//广告管理
path: '/advmanager', //广告管理
name: 'advmanager',
component: resolve => require(['@/components/platformModule/advmanager'], resolve),
meta: {
......@@ -2682,7 +2687,7 @@ export default {
},
},
{
path: '/myadvert',//我的广告
path: '/myadvert', //我的广告
name: 'myadvert',
component: resolve => require(['@/components/SalesModule/myadvert'], resolve),
meta: {
......@@ -2931,7 +2936,7 @@ export default {
meta: {
title: '抽奖列表'
}
},{
}, {
path: '/awardList',
name: 'awardList',
component: resolve => require(['@/components/activity/awardList'], resolve),
......
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