Skip to content

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

机票采购修改

parent 58099078
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 78 deletions
src/components/TravelManager/Ticket/TravelMyTicket.vue
View file @ 1c51a199
...@@ -901,7 +901,7 @@ ...@@ -901,7 +901,7 @@
<el-row :gutter="0"> <el-row :gutter="0">
<el-col :span="8"> <el-col :span="8">
<div class="TCID_cont PingFangSC"> <div class="TCID_cont PingFangSC">
{{$t('visa.v_tuanhao')}}：<span v-if="item.TCNUM!=''">{{item.TCNUM}}</span> {{$t('visa.v_tuanhao')}}：<span v-if="item.TCNUM!=''">（{{item.TCID}}）{{item.TCNUM}}</span>
</div> </div>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
......
src/components/activity/CouponList.vue
View file @ 1c51a199
...@@ -131,84 +131,85 @@ ...@@ -131,84 +131,85 @@
<th>{{$t('hotel.hotel_remark')}}</th> <th>{{$t('hotel.hotel_remark')}}</th>
<th>{{$t('system.table_operation')}}</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr v-for="(item,index) in DataList" v-loading="loading"> <tbody v-loading="loading">
<td>{{item.couponsName}}</td> <tr v-for="(item,index) in DataList" :key="index">
<td>{{item.couponCount}}</td> <td>{{item.couponsName}}</td>
<td> <td>{{item.couponCount}}</td>
<span class="_couponReceiveCount" <td>
@click="item.couponReceiveCount === 0 ? '' : goDetail('CouponDetail', item)">{{item.couponReceiveCount}}</span> <span class="_couponReceiveCount"
</td> @click="item.couponReceiveCount === 0 ? '' : goDetail('CouponDetail', item)">{{item.couponReceiveCount}}</span>
<td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }} </td>
</td> <td>{{(item.couponCount - item.couponReceiveCount) > 0 ? (item.couponCount - item.couponReceiveCount) : 0 }}
<td>{{item.branchName}}</td> </td>
<td>{{item.lineId <= 0 ? $t('pub.unlimitedSel') : item.lineName}}</td> <td>{{item.branchName}}</td>
<td>{{item.lineteamId <= 0 ? $t('pub.unlimitedSel') : item.lineTeamName}}</td> <td>{{item.lineId <= 0 ? $t('pub.unlimitedSel') : item.lineName}}</td>
<td>{{item.couponsType ===1 ? $t('active.cl_dyquan') : $t('active.cl_zkquan')}}</td> <td>{{item.lineteamId <= 0 ? $t('pub.unlimitedSel') : item.lineTeamName}}</td>
<td>{{item.useCondition}}</td> <td>{{item.couponsType ===1 ? $t('active.cl_dyquan') : $t('active.cl_zkquan')}}</td>
<td>{{item.denomination}}</td> <td>{{item.useCondition}}</td>
<td>{{item.overlapUse === 0 ? $t('active.cl_byxu') : $t('active.cl_yuncu')}}</td> <td>{{item.denomination}}</td>
<td>{{item.effectDate}}</td> <td>{{item.overlapUse === 0 ? $t('active.cl_byxu') : $t('active.cl_yuncu')}}</td>
<td> <td>{{item.effectDate}}</td>
<span v-if="item.couponEffectStatus === 1" style="color: green">{{$t('active.cl_sxzhong')}}</span> <td>
<span v-if="item.couponEffectStatus === 2" style="color: gray">{{$t('active.cl_wsxiao')}}</span> <span v-if="item.couponEffectStatus === 1" style="color: green">{{$t('active.cl_sxzhong')}}</span>
<span v-if="item.couponEffectStatus === 3" style="color: red">{{$t('active.cl_ygqi')}}</span> <span v-if="item.couponEffectStatus === 2" style="color: gray">{{$t('active.cl_wsxiao')}}</span>
</td> <span v-if="item.couponEffectStatus === 3" style="color: red">{{$t('active.cl_ygqi')}}</span>
</td>
<td>{{item.expirationDate}}</td>
<td>
<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>
</td>
<td>
<span v-if="item.couponStatus == 1" style="color: green">{{$t('pub.normalSel')}}</span>
<span v-if="item.couponStatus == 2" style="color: gray">{{$t('active.ld_jinyong')}}</span>
<span v-if="item.couponStatus == 3" style="color: red">{{$t('system.ph_shanchu')}}</span>
</td>
<td>
<span v-if="item.activityIsEnding=='0'">未结束</span>
<span v-if="item.activityIsEnding=='1'">已结束</span>
</td>
<td>{{item.redemptionPrice}}</td>
<td>
<p>{{$t('system.table_begTime')}}：{{item.activityStartDate}}</p>
<p>{{$t('MarketingActi.endTime')}}：{{item.activityEndDate}}</p>
</td>
<td>{{item.remark}}</td>
<td class="text_al_left">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button v-if="item.couponEffectStatus === 2 && item.couponStatus === 1" type="primary"
icon="el-icon-edit" circle
@click="outerVisible=true,dialogTitle=$t('pub.updateMsg'),updateData(item),getCompany(),getCouponPlatformEnum()">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_jyCoupon')" placement="top">
<el-button v-if="item.couponStatus !== 2" type="danger" icon="iconfont icon-jinyong" circle
@click="deleteItem(item, 2)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_hfCoupon')" placement="top">
<el-button v-if="item.couponStatus === 2" type="success" icon="iconfont icon-huifu" circle
@click="deleteItem(item, 3)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_deleteCoupon')" placement="top">
<el-button v-if="item.couponStatus === 2" type="danger" icon="iconfont icon-img_delete_small" circle
@click="deleteItem(item)"></el-button>
</el-tooltip>
<td>{{item.expirationDate}}</td> <el-tooltip class="item" effect="dark" content="修改当日活动库存" placement="top">
<td> <el-button type="primary" icon="el-icon-edit" circle style="padding:6px;" @click="updateKucundialog=true">
<span v-if="item.couponsUseScope == 1">{{$t('MarketingActi.alltongyong')}}</span> </el-button>
<span v-if="item.couponsUseScope == 2">{{$t('active.cl_team')}}</span> </el-tooltip>
<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>
</td>
<td>
<span v-if="item.couponStatus == 1" style="color: green">{{$t('pub.normalSel')}}</span>
<span v-if="item.couponStatus == 2" style="color: gray">{{$t('active.ld_jinyong')}}</span>
<span v-if="item.couponStatus == 3" style="color: red">{{$t('system.ph_shanchu')}}</span>
</td>
<td>
<span v-if="item.activityIsEnding=='0'">未结束</span>
<span v-if="item.activityIsEnding=='1'">已结束</span>
</td>
<td>{{item.redemptionPrice}}</td>
<td>
<p>{{$t('system.table_begTime')}}：{{item.activityStartDate}}</p>
<p>{{$t('MarketingActi.endTime')}}：{{item.activityEndDate}}</p>
</td>
<td>{{item.remark}}</td>
<td class="text_al_left">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<el-button v-if="item.couponEffectStatus === 2 && item.couponStatus === 1" type="primary"
icon="el-icon-edit" circle
@click="outerVisible=true,dialogTitle=$t('pub.updateMsg'),updateData(item),getCompany(),getCouponPlatformEnum()">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_jyCoupon')" placement="top">
<el-button v-if="item.couponStatus !== 2" type="danger" icon="iconfont icon-jinyong" circle
@click="deleteItem(item, 2)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_hfCoupon')" placement="top">
<el-button v-if="item.couponStatus === 2" type="success" icon="iconfont icon-huifu" circle
@click="deleteItem(item, 3)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('active.cl_deleteCoupon')" placement="top">
<el-button v-if="item.couponStatus === 2" type="danger" icon="iconfont icon-img_delete_small" circle
@click="deleteItem(item)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改当日活动库存" placement="top"> <el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button type="primary" icon="el-icon-edit" circle style="padding:6px;" @click="updateKucundialog=true"> <el-button v-if="EditBtn" type="danger" icon="iconfont icon-xiugai" circle style="padding:4px;"
</el-button> @click="outerVisible=true,EditItem(item)"></el-button>
</el-tooltip> </el-tooltip>
</td>
<el-tooltip class="item" effect="dark" content="修改" placement="top"> </tr>
<el-button v-if="EditBtn" type="danger" icon="iconfont icon-xiugai" circle style="padding:4px;" </tbody>
@click="outerVisible=true,EditItem(item)"></el-button>
</el-tooltip>
</td>
</tr>
</table> </table>
<div class="noDataNotice" v-if="DataList.length<1"> <div class="noDataNotice" v-if="DataList.length<1">
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
...@@ -403,7 +404,6 @@ ...@@ -403,7 +404,6 @@
<el-form-item label="订单类型" prop="lineId"> <el-form-item label="订单类型" prop="lineId">
<el-select filterable v-model="addMsg.expansionModel.orderType"> <el-select filterable v-model="addMsg.expansionModel.orderType">
<el-option label="小包团" :value="2"></el-option> <el-option label="小包团" :value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
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