Skip to content

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

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

parents 7f7d5b30 3a413087
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 229 additions and 142 deletions
src/components/SalesVisa/VisaProduct.vue
View file @ 529f07f4
<style>
@import "../../assets/css/newTravelManager.css";
.page_MyCustomer ._mc_addbox {
height: 52px;
width: 100%;
......@@ -292,7 +293,23 @@
<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-select v-model="msg.ckedplat" multiple
@change="checkDialog"
clearable
collapse-tags>
<el-option
v-for="sales in $tripUtils.TeamStatesList.salsPlat"
:key="sales.Id"
:label="sales.Name"
:value="sales.Id"
:disabled="
(sales.Id == '2' || sales.Id == '5') && SaleB2COrWeChatStatus
? true
: false
">
</el-option>
</el-select>
<!-- <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">
......@@ -312,7 +329,7 @@
{{ sales.Name }}</el-checkbox>
</el-checkbox-group>
</template>
</span>
</span> -->
</span>
</li>
<li>
......@@ -329,7 +346,16 @@
tooltip-effect="dark"
style="width: 100%"
>
<el-table-column :label="$t('sm.company')" prop="BranchName"></el-table-column>
<el-table-column :label="$t('sm.company')" prop="BranchName" width="200">
<template slot-scope="scope">
<p>{{ scope.row.BranchName }}</p>
<div class="TC_TravelSalePlat clearfix" style="margin: 0;">
<span class="TC_neibu"
:class="{TCneibu: plat == 3, TCb2b: plat == 1,TCb2c: plat == 2, AppPlat: plat == 4, otherPlat: plat == 5,}"
v-for="plat in scope.row.SalePlatList" :key="plat.subCode">{{ $tripUtils.getPlatName(plat) }}</span>
</div>
</template>
</el-table-column>
<el-table-column :label="$t('hotel.product_name')" prop="Name"></el-table-column>
<el-table-column :label="$t('visa.v_visaType')" prop="">
<template slot-scope="scope">
......
src/components/activity/CouponList.vue
View file @ 529f07f4
......@@ -132,6 +132,16 @@
<el-option :label="$t('op.smallteam')" :value="10"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{$t('objFill.v102.fafangkeix')}}</em>
<el-select filterable v-model="msg.CustomerType">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option :label="$t('Operation.Op_fellow')" value="0"></el-option>
<el-option :label="$t('Operation.Op_direct')" value="1"></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()">
......@@ -158,7 +168,7 @@
<th>{{$t('active.cl_djshiyong')}}</th>
<th>{{$t('active.cl_sxriqi')}}</th>
<th>{{$t('active.cl_sxzhuangtai')}}</th>
<th>{{$t('active.cl_gqriqi')}}</th>
<!-- <th>{{$t('active.cl_gqriqi')}}</th> -->
<th>{{$t('MarketingActi.usingRange')}}</th>
<th>{{$t('admin.admin_status')}}</th>
<th>{{$t('objFill.v101.activity.shifoujies')}}</th>
......@@ -169,7 +179,7 @@
</tr>
<tbody v-loading="loading">
<tr v-for="(item,index) in DataList" :key="index">
<td>{{item.couponsName}}</td>
<td>{{item.couponsName}}<span style="color:red;">({{item.customerType==0?$t('Operation.Op_fellow'): $t('Operation.Op_direct')}})</span> </td>
<td>{{item.couponCount}}</td>
<td>
<span class="_couponReceiveCount"
......@@ -184,21 +194,15 @@
<td>{{item.useCondition}}</td>
<td>{{item.denomination}}</td>
<td>{{item.overlapUse === 0 ? $t('active.cl_byxu') : $t('active.cl_yuncu')}}</td>
<td>{{item.effectDate}}</td>
<td><p>{{item.effectDate}}</p><p>{{item.expirationDate}}</p></td>
<td>
<span v-if="item.couponEffectStatus === 1" style="color: green">{{$t('active.cl_sxzhong')}}</span>
<span v-if="item.couponEffectStatus === 2" style="color: gray">{{$t('active.cl_wsxiao')}}</span>
<span v-if="item.couponEffectStatus === 3" style="color: red">{{$t('active.cl_ygqi')}}</span>
</td>
<td>{{item.expirationDate}}</td>
<!-- <td>{{item.expirationDate}}</td> -->
<td>
{{item.couponsUseScope.couponsUseScope}}
<!-- <span v-if="item.couponsUseScope == 1">{{$t('MarketingActi.alltongyong')}}</span>
<span v-if="item.couponsUseScope == 2">{{$t('active.cl_team')}}</span>
<span v-if="item.couponsUseScope == 3">{{$t('active.cl_qianzheng')}}</span>
<span v-if="item.couponsUseScope == 4">{{$t('active.cl_jipiao')}}</span>
<span v-if="item.couponsUseScope == 5">{{$t('scen.sc_piao')}}</span>
<span v-if="item.couponsUseScope == 6">{{$t('MarketingActi.car')}}</span> -->
{{item.couponsUseScopeStr}}
</td>
<td>
<span v-if="item.couponStatus == 1" style="color: green">{{$t('pub.normalSel')}}</span>
......@@ -388,16 +392,6 @@
<el-form-item :label="$t('active.cl_syfanwei')">
<el-select filterable v-model="addMsg.couponsUseScope">
<el-option v-for="(item,index) in ScopeOfUseList" :key="index" :label="item.Name" :value="item.Id"></el-option>
<!-- <el-option :label="$t('active.cl_tongyong')" :value="1"></el-option>
<el-option :label="$t('active.cl_team')" :value="2"></el-option>
<el-option :label="$t('active.cl_qianzheng')" :value="3"></el-option>
<el-option :label="$t('active.cl_jipiao')" :value="4"></el-option>
<el-option :label="$t('scen.sc_piao')" :value="5"></el-option>
<el-option :label="$t('MarketingActi.car')" :value="6"></el-option>
<el-option :label="$t('MarketingActi.free')" :value="7"></el-option>
<el-option :label="$t('MarketingActi.local')" :value="8"></el-option>
<el-option :label="$t('hotel.hotel')" :value="9"></el-option>
<el-option :label="$t('op.smallteam')" :value="10"></el-option> -->
</el-select>
</el-form-item>
</el-col>
......@@ -407,10 +401,14 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('hotel.hotel_remark')">
<el-input v-model="addMsg.remark" class="w217" :placeholder="$t('pub.pleaseImport')" />
<el-form-item :label="$t('objFill.v102.fafangkeix')">
<el-radio-group v-model="addMsg.customerType" :disabled="addMsg.id>0" >
<el-radio :label="0">{{$t('Operation.Op_fellow')}}</el-radio>
<el-radio :label="1">{{$t('Operation.Op_direct')}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('objFill.v101.activity.shiyongpint')" prop="openPlatformList">
<el-select filterable class="w217" :multiple="true" v-model="addMsg.openPlatformList"
......@@ -458,6 +456,11 @@
<el-input v-model="addMsg.expansionModel.orderGuestNum" class="w217" type="number" />
</el-form-item>
</el-col>
<el-col :span="22">
<el-form-item :label="$t('hotel.hotel_remark')">
<el-input v-model="addMsg.remark" :placeholder="$t('pub.pleaseImport')" />
</el-form-item>
</el-col>
<!-- <el-col :span="12">
<el-form-item :label="$t('active.cl_orderType')" prop="lineId">
<el-select filterable v-model="addMsg.expansionModel.orderType">
......@@ -616,6 +619,7 @@
groupId: '',
branchId: '',
couponsUseScope: "",
CustomerType:"-1",
},
rules: {
branchId: [{
......@@ -692,6 +696,7 @@
lineteamId: 0,
couponsUseScope: 1,
couponStatus: 1,
customerType: 0,
redemptionPrice: '',
remark: "",
autoGrant: "",
......@@ -828,7 +833,11 @@
}
}
this.addMsg = Object.assign({}, item);
console.log("item",item.customerType);
if (item.couponPriceLists || item.lineId || item.lineteamId || item.effectDate || item.expirationDate) {
if(item.lineId>0){
this.getLineTeamList(item.lineId);
}
this.getTravelPrciePageList()
}
},
......@@ -1056,6 +1065,7 @@
this.addMsg.checkInLineList = item.checkInLineList
this.addMsg.lineIdList = item.lineIdList
this.addMsg.lineteamIdList = item.lineteamIdList
this.addMsg.customerType = item.customerType
if (item.expansionModel === null) {
this.addMsg.expansionModel = {
orderType: "",
......@@ -1156,6 +1166,7 @@
activityEndDate: "",
overlapUse: 0,
useCondition: "",
customerType:0,
id: 0,
couponCount: '',
lineteamId: 0,
......
src/components/activity/autorelease.vue
View file @ 529f07f4
......@@ -32,7 +32,7 @@
</el-table-column>
<el-table-column
prop="GrantNum"
label="发放次数限制">
:label="$t('objFill.v102.fafangcishu')">
<template slot-scope="scope">
<div v-if="scope.row.GrantNum==0">
无限制
......@@ -42,7 +42,23 @@
</div>
</template>
</el-table-column>
<el-table-column
prop="GrantCouponNum"
:label="$t('objFill.v102.fafangzhangshu')">
</el-table-column>
<el-table-column
prop="GrantNum"
:label="$t('objFill.v102.fafangkeix')">
<template slot-scope="scope">
<div v-if="scope.row.SelfMotionType==0">
{{$t('Operation.Op_fellow')}}
</div>
<div v-else-if="scope.row.SelfMotionType==1">
{{$t('Operation.Op_direct')}}
</div>
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作" width="100"
......
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