Skip to content

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

制单入口调整

parent 18cae8f8
Hide whitespace changes
Inline Side-by-side
Showing with 75 additions and 65 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 24e82fc1
......@@ -2311,26 +2311,26 @@
</div>
</td>
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div >
<div>{{ $t("fnc.skdanju") }}：</div>
<div>
<span v-for="(item2, index2) in item.financeList" :key="index2">
<span v-for="(item2, index2) in item.financeList" :key="index2" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 3" class="groupTourOrder_tickets_red">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
<!-- @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" -->
</span>
<span v-if="item.financeList.length === 0"
style="cursor: default">{{ $t("system.content_noData") }}</span>
</div>
</div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div >
<div>{{ $t("fnc.fkdanju") }}：</div>
<div>
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2">
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 24e82fc1
......@@ -874,7 +874,6 @@
.groupts .el-upload-list {
width: 200px;
}
</style>
<template>
......@@ -1068,7 +1067,8 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('tips.jiaoyifangshi')" prop="TradeWay" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
<el-form-item :label="$t('tips.jiaoyifangshi')" prop="TradeWay"
v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
<el-select v-model="addMsg.TradeWay" :disabled="true" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id+7000">
</el-option>
......@@ -1546,7 +1546,8 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item :label="$t('tips.jiaoyifangshi')" prop="TradeWay" v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
<el-form-item :label="$t('tips.jiaoyifangshi')" prop="TradeWay"
v-show="addMsg.ClientSource == 1|| addMsg.ClientSource == 4">
<el-select v-model="addMsg.TradeWay" :disabled="addMsg.OrderForm !== 4 ? true : false" filterable
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id+80000">
......@@ -2353,7 +2354,9 @@
<span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
<span style="cursor:pointer;"
@click="goProtocol(item,childItem)">{{childItem.protocolId>0?"查看保密协议":"签订保密协议"}}</span>
<span v-if="item.isShowDisclaimer==1&&( isShow===index||childItem.disclaimerId>0)" style="cursor:pointer;" @click="goDisclaimer(item,childItem)">{{childItem.disclaimerId>0?"查看参团免责承诺函":"签订参团免责承诺函"}}</span>
<span v-if="item.isShowDisclaimer==1&&( isShow===index||childItem.disclaimerId>0)"
style="cursor:pointer;"
@click="goDisclaimer(item,childItem)">{{childItem.disclaimerId>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>
......@@ -2389,9 +2392,9 @@
" style="color: #f56c6c; margin-left: 20px; cursor: pointer">退景点</span>
</el-popover>
</span>
<div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)" >
<span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
</span>
<div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)">
<span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
</span>
</div>
<div>
<span v-if="item.opTipMoney == '' && item.tipMoney != ''"
......@@ -2532,20 +2535,23 @@
<span>OP备注:</span>
<p>{{ item.oP_Remarks ? item.oP_Remarks : "无" }}</p>
</div>
<div v-if="item.changePriceId>0&&(item.isOwn == 1 || IsSupperOrderEdit ||IsLookOrder || isUpdateOrder)" style=" overflow:hidden;">
<span style="color:red;">改价申请:</span> <span> 申请金额【<span style="color:red;">{{item.changePriceMoney}}</span>元】{{item.changePriceReason}}</span>
<div style="text-align:right;" v-if="item.changePriceState==1">
待{{item.ChangePriceType=="2"?"OP":"主管"}}{{item.managerExamineName}}审核
</div>
<div style="text-align:right;" v-if="item.changePriceState==2">
待{{item.ChangePriceType=="2"?"会计":"总经理"}}{{item.examineByName}}审核
</div>
<div v-if="item.changePriceState==4" style="text-align:right;">
已驳回
</div>
<div v-if="item.changePriceState==3" style="text-align:right;">
已通过
</div>
<div
v-if="item.changePriceId>0&&(item.isOwn == 1 || IsSupperOrderEdit ||IsLookOrder || isUpdateOrder)"
style=" overflow:hidden;">
<span style="color:red;">改价申请:</span> <span> 申请金额【<span
style="color:red;">{{item.changePriceMoney}}</span>元】{{item.changePriceReason}}</span>
<div style="text-align:right;" v-if="item.changePriceState==1">
待{{item.ChangePriceType=="2"?"OP":"主管"}}{{item.managerExamineName}}审核
</div>
<div style="text-align:right;" v-if="item.changePriceState==2">
待{{item.ChangePriceType=="2"?"会计":"总经理"}}{{item.examineByName}}审核
</div>
<div v-if="item.changePriceState==4" style="text-align:right;">
已驳回
</div>
<div v-if="item.changePriceState==3" style="text-align:right;">
已通过
</div>
</div>
</div>
</td>
......@@ -2570,12 +2576,10 @@
<div v-else>******</div>
</td>
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
<div @click="
goUrlSFD('SalesFinancialDetail', '销售财务单据', item)
">
<div>
<div>收款单据：</div>
<div>
<span v-for="(item2, index2) in item.financeList" :key="index2+210000">
<span v-for="(item2, index2) in item.financeList" :key="index2+210000" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
......@@ -2584,15 +2588,15 @@
<span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
</span>
<span v-if="item.financeList.length === 0" style="cursor: default">{{$t('system.content_noData')}}</span>
<span v-if="item.financeList.length === 0"
style="cursor: default">{{$t('system.content_noData')}}</span>
</div>
</div>
<div @click="
goUrlSFD('SalesFinancialDetail', '销售财务单据', item)
">
<!--@click="(item.orderState==1||item.orderState==2)?goUrlSFD('SalesFinancialDetail', '销售财务单据', item):''"-->
<div>
<div>付款单据：</div>
<div>
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2+220000">
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2+220000" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span v-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
......@@ -2601,7 +2605,8 @@
<span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
</span>
<span v-if="item.refundFinanceList.length === 0" style="cursor: default">{{$t('system.content_noData')}}</span>
<span v-if="item.refundFinanceList.length === 0"
style="cursor: default">{{$t('system.content_noData')}}</span>
</div>
</div>
<div>
......@@ -2622,7 +2627,8 @@
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{ item2.id }}</span>
</span>
<span v-if="item.invoiceApplyList.length === 0" style="cursor: default">{{$t('system.content_noData')}}</span>
<span v-if="item.invoiceApplyList.length === 0"
style="cursor: default">{{$t('system.content_noData')}}</span>
</div>
</div>
</td>
......@@ -3020,7 +3026,8 @@
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div
@click="(item.orderState==1||item.orderState==2)?goUrlSFD('SalesFinancialDetail', '销售财务单据', item):''">
<div>收款单据：</div>
<div>
<span v-for="(item2, index2) in item.financeList" :key="index2+280000">
......@@ -3031,10 +3038,12 @@
<span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
</span>
<span v-if="item.financeList.length === 0" style="cursor: default">{{$t('system.content_noData')}}</span>
<span v-if="item.financeList.length === 0"
style="cursor: default">{{$t('system.content_noData')}}</span>
</div>
</div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div
@click="(item.orderState==1||item.orderState==2)?goUrlSFD('SalesFinancialDetail', '销售财务单据', item):''">
<div>付款单据：</div>
<div>
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2+290000">
......@@ -3045,7 +3054,8 @@
<span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
</span>
<span v-if="item.refundFinanceList.length === 0" style="cursor: default">{{$t('system.content_noData')}}</span>
<span v-if="item.refundFinanceList.length === 0"
style="cursor: default">{{$t('system.content_noData')}}</span>
</div>
</div>
<div>
......@@ -3066,7 +3076,8 @@
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{ item2.id }}</span>
</span>
<span v-if="item.invoiceApplyList.length === 0" style="cursor: default">{{$t('system.content_noData')}}</span>
<span v-if="item.invoiceApplyList.length === 0"
style="cursor: default">{{$t('system.content_noData')}}</span>
</div>
</div>
</td>
......@@ -3264,7 +3275,7 @@
export default {
data() {
return {
isShow:"",
isShow: "",
timer: false,
fullHeight: document.documentElement.clientHeight,
ScreenHeight: 0,
......@@ -3691,13 +3702,13 @@
},
},
methods: {
showMore(item,index){
if (this.isShow===index){
this.isShow=''
}else{
this.isShow= index;
}
},
showMore(item, index) {
if (this.isShow === index) {
this.isShow = ''
} else {
this.isShow = index;
}
},
//跳转到保密协议
goProtocol(item, sItem) {
let ProtocolId = 0;
......@@ -3725,8 +3736,8 @@
window.open(routeData.href, "_blank");
},
//跳转到老人/孕妇免责协议
goDisclaimer(item, sItem) {
//跳转到老人/孕妇免责协议
goDisclaimer(item, sItem) {
let ProtocolId = 0;
let guestId = 0;
var path = "disclaimerProtocol";
......@@ -4993,13 +5004,13 @@
this.addObj.ChildNoNeedPrice *
(Number(this.addMsg.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum));
let lianyun =0;
let lianyun = 0;
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) *
// (Number(this.stratPrice) + Number(this.returnPrice));
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) *
// (Number(this.stratPrice) + Number(this.returnPrice));
let dandijie;
if (this.addMsg.GroupType == 4) {
dandijie =
......@@ -5062,11 +5073,11 @@
this.addObj.ChildNoNeedPrice *
(Number(this.addMsg.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum));
let lianyun =0;
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) *
// (Number(this.stratPrice) + Number(this.returnPrice));
let lianyun = 0;
// (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) *
// (Number(this.stratPrice) + Number(this.returnPrice));
let dandijie;
if (this.addMsg.GroupType == 4) {
dandijie =
......@@ -6082,5 +6093,4 @@
this.canEditUnitPrice();
},
};
</script>
</script>
\ No newline at end of file
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