Skip to content

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

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

parents 69a1879f c9844e11
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 22 deletions
src/components/FinancialModule/platOrderquery.vue
View file @ 9e218146
......@@ -230,7 +230,7 @@
<span>{{item.orderId}}</span>
<span style="font-weight: 100;" v-if="item.scoreNum >= 0" @click='goInvetig("investigationList", item.tcid, item.orderId)'>({{$t('salesModule.ScoreNUM')}}{{item.scoreNum}})</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4||item.orderForm==7"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
v-show="item.isFormB2B ==1"> <i class="iconfont icon-tiaozheng"
style="font-size:22px;color:#297BEF;"></i></el-tooltip>
......
src/components/SalesModule/enrollTotal.vue
View file @ 9e218146
......@@ -340,7 +340,7 @@
<span style="font-weight: 100" v-if="item.scoreNum >= 0"
@click="goInvetig('investigationList', item.tcid, item.orderId)">({{ $t("salesModule.ScoreNUM") }}{{ item.scoreNum }})</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm == 4">
v-show="item.orderForm == 4||item.orderForm == 7">
<i class="iconfont icon-xiaochengxu" style="font-size: 22px; color: red"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
......
src/components/SalesModule/groupTourOrder.vue
View file @ 9e218146
......@@ -1370,6 +1370,33 @@
</el-form>
</div>
<!-- 修改单男单女-->
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="showChangeGender"
style="height: 150px; min-height: 200px">
<p>
{{ $t("salesModule.SingleFM") }}
<span class="fr">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="closeGenderDiv()" />
<input type="button" class="normalBtn" :value="$t('pub.saveBtn')" @click="SetGender()" />
</span>
</p>
<el-form :model="subGenderInfo" :inline="true" ref="subGenderInfo" label-position="right" :rules="subGenderInfo" label-width="80px">
<!-- <el-row :gutter="20">
<el-col :span="12"> -->
<el-form-item :label="$t('hotel.order_Number')" >
{{subGenderInfo.OrderId}}
</el-form-item>
<el-form-item :label="$t('salesModule.SingleFM')" style="margin-left: 58px">
<el-radio-group v-model="subGenderInfo.TipMoney">
<el-radio :label="0">{{$t("pub.no")}}</el-radio>
<el-radio :label="1">{{$t("pub.man")}}</el-radio>
<el-radio :label="2">{{$t("pub.woman")}}</el-radio>
</el-radio-group>
</el-form-item>
<!-- </el-col>
</el-row> -->
</el-form>
</div>
<div class="groupTourOrderSearch">
<ul>
<li>
......@@ -1691,7 +1718,7 @@
goInvetig('investigationList', item.tcid, item.orderId)
">({{$t('salesModule.ScoreNUM')}}{{ item.scoreNum }})</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm == 4">
v-show="item.orderForm == 4||item.orderForm == 7">
<i class="iconfont icon-xiaochengxu" style="font-size: 22px; color: red"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
v-show="item.isFormB2B == 1">
......@@ -2068,6 +2095,10 @@
}}</span>
<span v-else>{{ $t("salesModule.LossReceipt") }}</span>
</div>
<div v-if="item.orderState == '1' || item.orderState == '2'|| item.orderState == '3'" @click="getOrderGender(item)">
{{$t("pub.updateMsg")+$t("salesModule.SingleFM")}}
</div>
<!-- item.confirmFileList.length>0 && ((item.receivableMoney - item.invoiceApplyTotal) > 0) -->
<div v-if="
(item.confirmFileList.length > 0 ||
......@@ -2498,6 +2529,24 @@
</button>
</div>
</el-dialog>
<!-- <el-dialog :title="$t('objFill.xuanzhelk')" width="400px" :visible.sync="showChangeGender" center :before-close="closeGenderDiv">
<div class="needfenshu">
<label>{{ $t("salesModule.SingleFM") }}：</label>
<el-radio-group v-model="subGenderInfo.TipMoney">
<el-radio :label="0">{{$t("pub.no")}}</el-radio>
<el-radio :label="1">{{$t("pub.man")}}</el-radio>
<el-radio :label="2">{{$t("pub.woman")}}</el-radio>
</el-radio-group>
</div>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="closeGenderDiv">
{{ $t("pub.cancelBtn") }}
</button>
<button class="normalBtn" type="primary" @click="SetGender">
{{ $t("pub.sureBtn") }}
</button>
</div>
</el-dialog> -->
</div>
</template>
......@@ -2759,7 +2808,8 @@
ScenicRefundMoney: 0,
//显示修改业务员
showChangeSales: false,
//显示修改单男单女
showChangeGender: false,
//支付
minpay: "0",
......@@ -2806,6 +2856,11 @@
CreateBy: "",
OrderId: 0,
},
//订单编号及业务员信息
subGenderInfo: {
TipMoney: 0,
OrderId: 0,
},
// 申请优惠的弹窗
SpecialOffer: false,
SOMsg: {
......@@ -4834,10 +4889,40 @@
this.subInfo.OrderId = item.orderId;
this.showChangeSales = true;
},
//关闭修改业务员
closeSalseDiv() {
//关闭修改业务员
closeSalseDiv() {
this.showChangeSales = false;
},
//点击修改单男单女
getOrderGender(item) {
console.log("我进来了",item);
this.subGenderInfo.TipMoney = item.oneSex;
this.subGenderInfo.OrderId = item.orderId;
this.showChangeGender = true;
console.log("我进来了",this.subGenderInfo);
},
//关闭修改单男单女
closeGenderDiv() {
this.subGenderInfo.TipMoney = 0;
this.subGenderInfo.OrderId = 0;
this.showChangeGender = false;
},
SetGender() {
this.apipost(
"sellorder_post_SetOrderGender",this.subGenderInfo,
(res) => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
this.closeGenderDiv();
}else{
this.$message.error(res.data.message);
}
},
(err) => {}
);
},
Discount(TCID) {
this.SpecialOffer = true;
this.apipost(
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 9e218146
......@@ -1826,7 +1826,7 @@
goInvetig('investigationList', item.tcid, item.orderId)
">({{$t('salesModule.ScoreNUM')}}{{ item.scoreNum }})</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm == 4">
v-show="item.orderForm == 4||item.orderForm == 7">
<i class="iconfont icon-xiaochengxu" style="font-size: 22px; color: red"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
v-show="item.isFormB2B == 1">
......@@ -2767,7 +2767,7 @@
goInvetig('investigationList', item.tcid, item.orderId)
">({{$t('salesModule.ScoreNUM')}}{{ item.scoreNum }})</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm == 4">
v-show="item.orderForm == 4||item.orderForm == 7">
<i class="iconfont icon-xiaochengxu" style="font-size: 22px; color: red"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
v-show="item.isFormB2B == 1">
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ 9e218146
......@@ -1516,7 +1516,7 @@
<!-- <span style="font-weight: 100;" v-if="item.scoreNum >= 0">({{$t('salesModule.ScoreNUM')}}{{item.scoreNum}})</span> -->
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu"
v-show="item.orderForm==4||item.orderForm==7"> <i class="iconfont icon-xiaochengxu"
style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<div>
......@@ -1933,7 +1933,7 @@
<p v-if="item.isUnionOrder==1" class="GO_union">{{$t('Operation.Op_lian')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}
<span style="font-weight: 100;" v-if="item.scoreNum >= 0">({{$t('salesModule.ScoreNUM')}}{{item.scoreNum}})</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4">
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4||item.orderForm==7">
<i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;">
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 9e218146
......@@ -1463,7 +1463,7 @@
<span style="font-weight: 100;"
v-if="item.scoreNum >= 0">({{$t('salesModule.ScoreNUM')}}{{item.scoreNum}})</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu"
v-show="item.orderForm==4||item.orderForm==7"> <i class="iconfont icon-xiaochengxu"
style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
......
src/components/SalesVisa/VisaShouSun.vue
View file @ 9e218146
......@@ -129,7 +129,7 @@
@click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">
{{item.orderId}}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i>
v-show="item.orderForm==4||item.orderForm==7"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i>
</el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
......
src/components/Ticketing/IndividualTicketOrder.vue
View file @ 9e218146
......@@ -136,7 +136,7 @@
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">
<span>{{item.orderId}}</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4||item.orderForm==7"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
v-show="item.isFormB2B ==1"> <i class="iconfont icon-tiaozheng"
style="font-size:22px;color:#297BEF;"></i></el-tooltip>
......
src/components/Ticketing/TicketShouSun.vue
View file @ 9e218146
......@@ -121,7 +121,7 @@
<td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4||item.orderForm==7"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
@click="goUrlX('产品查询', item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 9e218146
......@@ -1864,7 +1864,7 @@
<div class="fbold over_ellipsis" style="width: 120px; cursor: pointer" :title="item.OrderId">
{{ item.OrderId }}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.OrderForm == 4">
v-show="item.OrderForm == 4||item.OrderForm == 7">
<i class="iconfont icon-xiaochengxu" style="font-size: 22px; color: red"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
v-show="item.IsFormB2B == 1">
......@@ -2312,7 +2312,7 @@
">({{ $t("salesModule.ScoreNUM")
}}{{ childItem.scoreNum }})</span>{{ childItem.OrderId }}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="childItem.OrderForm == 4">
v-show="childItem.OrderForm == 4||childItem.OrderForm == 7">
<i class="iconfont icon-xiaochengxu" style="font-size: 22px; color: red"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
v-show="childItem.IsFormB2B == 1">
......@@ -3102,7 +3102,7 @@
@click="goUrlX('groupTourOrderByTuan', item.TCID, item.TCNUM)">
{{ item.OrderId }}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.OrderForm == 4">
v-show="item.OrderForm == 4||item.OrderForm == 7">
<i class="iconfont icon-xiaochengxu" style="font-size: 22px; color: red"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
v-show="item.IsFormB2B == 1">
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 9e218146
......@@ -291,7 +291,7 @@
">
{{ item.orderId }}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm == 4">
v-show="item.orderForm == 4||item.orderForm == 7">
<i class="iconfont icon-xiaochengxu" style="
font-size: 22px;
color: red;
......
src/components/administrative/ConfirmationAdui.vue
View file @ 9e218146
......@@ -111,7 +111,7 @@
<td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm==4||item.orderForm==7"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
@click="goUrlX('产品查询', item.isOneDay === 1 ? 'productQueryOne' : 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
......
src/components/dmc/manager/dmcShouSun.vue
View file @ 9e218146
......@@ -129,7 +129,7 @@
@click="goUrlX('团报名清单', item.isOneDay === 1 ? 'groupTourOrderByTuanOne' : 'groupTourOrderByTuan',item.tcid,item.tcnum)">
{{item.orderId}}
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i>
v-show="item.orderForm==4||item.orderForm==7"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i>
</el-tooltip>
</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
......
src/components/orderCommon/orderlist.vue
View file @ 9e218146
......@@ -106,7 +106,7 @@
" v-if="item.scoreNum >= 0"
@click="goInvetig('investigationList', item.tcid, item.orderId)">({{$t('salesModule.ScoreNUM')}}{{ item.scoreNum }})</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top"
v-show="item.orderForm == 4">
v-show="item.orderForm == 4||item.orderForm == 7">
<i class="iconfont icon-xiaochengxu" style="font-size: 22px; color: red"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top"
v-show="item.isFormB2B == 1">
......@@ -863,7 +863,7 @@
<span style="font-weight: 100; cursor: pointer" v-if="item.scoreNum >= 0" @click="
goInvetig('investigationList', item.tcid, item.orderId)
">({{$t('salesModule.ScoreNUM')}}{{ item.scoreNum }})</span>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm == 4">
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByProgram')" placement="top" v-show="item.orderForm == 4||item.orderForm == 7">
<i class="iconfont icon-xiaochengxu" style="font-size: 22px; color: red"></i></el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('salesModule.ByB2b')" placement="top" v-show="item.isFormB2B == 1">
<i class="iconfont icon-tiaozheng" style="font-size: 22px; color: #297bef"></i></el-tooltip>
......
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