Skip to content

S
SuperMan
Commit 58dce010 authored by 沈良进's avatar 沈良进
Browse files
Options

页面调整

parent f1590c89
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 17 deletions
src/components/Login2019.vue
View file @ 58dce010
......@@ -268,13 +268,6 @@
components: {
'my-carousel': Carousel
},
watch:{
'$route':function(old,newval)
{
console.log("old",old);
console.log("newval",newval);
}
},
methods: {
//初始化数据
initData() {
......
src/components/SalesModule/groupTourOrder.vue
View file @ 58dce010
......@@ -1060,7 +1060,6 @@
<el-form-item :label="$t('Operation.Op_zafei')">
<el-input v-model="addMsg_form.OtherPrice" :disabled="true"></el-input>
</el-form-item>
<el-form-item :label="$t('Operation.Op_oldmanSurcharge')">
<el-input v-model="addMsg_form.OldManChargePrice" :disabled="true"></el-input>
</el-form-item>
......@@ -1070,7 +1069,6 @@
<el-form-item :label="$t('Operation.Op_singleRoomcha')">
<el-input v-model="addMsg_form.SingleRoomPrice" :disabled="true"></el-input>
</el-form-item>
<el-form-item :label="$t('salesModule.ETZCZS')">
<el-input v-model="addMsg_form.ChildNeedPrice" :disabled="true"></el-input>
</el-form-item>
......@@ -1080,14 +1078,12 @@
<el-form-item :label="$t('salesModule.SSJE')">
<el-input v-model="addMsg_form.OpSetLossMoney" :disabled="true"></el-input>
</el-form-item>
<el-form-item :label="$t('salesModule.SingleJ')">
<el-input v-model="addMsg_form.SingleDMCPrice" :disabled="true"></el-input>
</el-form-item>
<el-form-item :label="$t('salesModule.BabyPrice')">
<el-input v-model="addMsg_form.BabyPrice" :disabled="true"></el-input>
</el-form-item>
</el-form>
</div>
</el-col>
......@@ -1701,12 +1697,13 @@
{{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}
</p>
<p>{{ $t("restaurant.res_oderTime") }}：{{ item.createDate }}</p>
<p v-if="item.teamType==1||item.teamType==2">{{item.status==1?"未结团":(item.status==2?"已结团 ":(item.status==5?"待结团审核":""))}}{{item.status==2?item.outGroupAuditDate:""}}</p>
<p v-if="item.teamType==1||item.teamType==2">
{{item.status==1?"未结团":(item.status==2?"已结团 ":(item.status==5?"待结团审核":""))}}{{item.status==2?item.outGroupAuditDate:""}}
</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<p v-if="item.commissionMoney" style="color: red;cursor: pointer;">
<span style="float: left;">{{ $t("salesModule.Commission") }}：</span>
<commissionDialog :type="pagesTitle" :objNew="item"></commissionDialog>{{item.commissionCurrency}}
<!-- {{ item.commissionMoney }} {{item.commissionCurrency}} -->
</p>
<p v-else-if="item.latestCommissionMoney" style="color: red">
{{ $t("salesModule.Commission") }}：{{
......@@ -2146,14 +2143,17 @@
<span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
<span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
<span v-if="childItem.isApplyPhoto == 1" style="color: red">({{ $t("salesModule.Zhao") }})</span>
&nbsp;&nbsp;</span>
<span style="cursor:pointer;" @click="goProtocol(item,childItem)">{{childItem.protocolId>0?"查看保密协议":"签订保密协议"}}</span>
&nbsp;&nbsp;
</span>
<span v-if="item.photoNum > 0">（{{ $t("salesModule.NoPhoto") }} {{ item.photoNum
}}{{ $t("salesModule.Fen") }}）</span>
</span>
<p v-if="item.cancelGuestList.length > 0">
<span class="">{{ $t("salesModule.CancelOrder") }}:</span>
<span class="RL-redType RL-remarkCon">
<span style="color: red" v-for="childItem in item.cancelGuestList">{{ childItem.userName }}<span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
<span style="color: red" v-for="childItem in item.cancelGuestList">{{ childItem.userName }}<span
style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
&nbsp;&nbsp;</span>
</span>
</p>
......@@ -2177,7 +2177,9 @@
<div v-if="item.otherContractList&&(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)">
<span class="GO_Contract"
@click="goSingleContract(item)">{{item.otherContractList.length==0?"单项合同":"查看单项合同"}}</span>
</div>
<div v-if="
item.contractNum.length == 0 &&
(qjGroupId == userInfo.RB_Group_id || F_ContractManagement)
......@@ -2951,6 +2953,32 @@
}
this.OpenNewPage('/ContractManage', query)
},
//跳转到保密协议
goProtocol(item, sItem) {
let ProtocolId = 0;
let guestId = 0;
var path = "discountProtocol";
if (sItem) {
if (sItem.protocolId) {
ProtocolId = sItem.protocolId;
}
if (sItem.guestId) {
guestId = sItem.guestId;
}
}
var pMsg = {
TCID: item.tcid,
GuestId: guestId,
OrderId: item.orderId,
ProtocolId: ProtocolId,
blank: "y",
}
let routeData = this.$router.resolve({
name: path,
query: pMsg,
});
window.open(routeData.href, "_blank");
},
//跳转至领取合同
goContract(item, sItem) {
let cid = 0;
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 58dce010
......@@ -2340,8 +2340,9 @@
{{childItem.userName}}
<span style="color:#f56c6c">{{childItem.visaType==1?'(个签)':''}}</span>
<span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
<span
v-if="childItem.isApplyPhoto == 1" style="color: red">(照)</span>&nbsp;&nbsp;</span>
<span style="cursor:pointer;"
@click="goProtocol(item,childItem)">{{childItem.protocolId>0?"查看保密协议":"签订保密协议"}}</span>
<span v-if="childItem.isApplyPhoto == 1" style="color: red">(照)</span>&nbsp;&nbsp;</span>
<span v-if="item.photoNum > 0">（照片一人 {{ item.photoNum }}份）</span>
</span>
<p v-if="item.cancelGuestList && item.cancelGuestList.length > 0">
......@@ -3651,6 +3652,32 @@
},
},
methods: {
//跳转到保密协议
goProtocol(item, sItem) {
let ProtocolId = 0;
let guestId = 0;
var path = "discountProtocol";
if (sItem) {
if (sItem.protocolId) {
ProtocolId = sItem.protocolId;
}
if (sItem.guestId) {
guestId = sItem.guestId;
}
}
var pMsg = {
TCID: item.tcid,
GuestId: guestId,
OrderId: item.orderId,
ProtocolId: ProtocolId,
blank: "y",
}
let routeData = this.$router.resolve({
name: path,
query: pMsg,
});
window.open(routeData.href, "_blank");
},
//关闭弹窗
closeDialog() {
this.isShowLayerRemarks = false;
......
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