Commit 24e82fc1 authored by 黄奎's avatar 黄奎

制单入口调整

parent 18cae8f8
...@@ -2311,26 +2311,26 @@ ...@@ -2311,26 +2311,26 @@
</div> </div>
</td> </td>
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px"> <td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <div >
<div>{{ $t("fnc.skdanju") }}:</div> <div>{{ $t("fnc.skdanju") }}:</div>
<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-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2" <span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span> 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 === 3" class="groupTourOrder_tickets_red">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 4" <span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span> class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
<!-- @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')" -->
</span> </span>
<span v-if="item.financeList.length === 0" <span v-if="item.financeList.length === 0"
style="cursor: default">{{ $t("system.content_noData") }}</span> style="cursor: default">{{ $t("system.content_noData") }}</span>
</div> </div>
</div> </div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <div >
<div>{{ $t("fnc.fkdanju") }}:</div> <div>{{ $t("fnc.fkdanju") }}:</div>
<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-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2" <span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span> class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
......
...@@ -874,7 +874,6 @@ ...@@ -874,7 +874,6 @@
.groupts .el-upload-list { .groupts .el-upload-list {
width: 200px; width: 200px;
} }
</style> </style>
<template> <template>
...@@ -1068,7 +1067,8 @@ ...@@ -1068,7 +1067,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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-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 v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id+7000">
</el-option> </el-option>
...@@ -1546,7 +1546,8 @@ ...@@ -1546,7 +1546,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <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 <el-select v-model="addMsg.TradeWay" :disabled="addMsg.OrderForm !== 4 ? true : false" filterable
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id+80000"> <el-option v-for="item in jyfsList" :label="item.Name" :value="item.Id" :key="item.Id+80000">
...@@ -2353,7 +2354,9 @@ ...@@ -2353,7 +2354,9 @@
<span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span> <span style="color:#f56c6c">{{childItem.ticketOutTypeStr}} </span>
<span style="cursor:pointer;" <span style="cursor:pointer;"
@click="goProtocol(item,childItem)">{{childItem.protocolId>0?"查看保密协议":"签订保密协议"}}</span> @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="childItem.isApplyPhoto == 1" style="color: red">(照)</span>&nbsp;&nbsp;</span>
<span v-if="item.photoNum > 0">(照片一人 {{ item.photoNum }}份)</span> <span v-if="item.photoNum > 0">(照片一人 {{ item.photoNum }}份)</span>
</span> </span>
...@@ -2389,7 +2392,7 @@ ...@@ -2389,7 +2392,7 @@
" style="color: #f56c6c; margin-left: 20px; cursor: pointer">退景点</span> " style="color: #f56c6c; margin-left: 20px; cursor: pointer">退景点</span>
</el-popover> </el-popover>
</span> </span>
<div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)" > <div class="order-show GO_Contract" v-if="item.isShowDisclaimer==1" @click="showMore(item,index)">
<span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}} <span>{{isShow===index ? "隐藏参团免责承诺函" : "显示参团免责承诺函"}}
</span> </span>
</div> </div>
...@@ -2532,8 +2535,11 @@ ...@@ -2532,8 +2535,11 @@
<span>OP备注:</span> <span>OP备注:</span>
<p>{{ item.oP_Remarks ? item.oP_Remarks : "无" }}</p> <p>{{ item.oP_Remarks ? item.oP_Remarks : "无" }}</p>
</div> </div>
<div v-if="item.changePriceId>0&&(item.isOwn == 1 || IsSupperOrderEdit ||IsLookOrder || isUpdateOrder)" style=" overflow:hidden;"> <div
<span style="color:red;">改价申请:</span> <span> 申请金额【<span style="color:red;">{{item.changePriceMoney}}</span>元】{{item.changePriceReason}}</span> 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"> <div style="text-align:right;" v-if="item.changePriceState==1">
待{{item.ChangePriceType=="2"?"OP":"主管"}}{{item.managerExamineName}}审核 待{{item.ChangePriceType=="2"?"OP":"主管"}}{{item.managerExamineName}}审核
</div> </div>
...@@ -2570,12 +2576,10 @@ ...@@ -2570,12 +2576,10 @@
<div v-else>******</div> <div v-else>******</div>
</td> </td>
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px"> <td colspan="5" class="groupTourOrder_tickets" style="height: 40px">
<div @click=" <div>
goUrlSFD('SalesFinancialDetail', '销售财务单据', item)
">
<div>收款单据:</div> <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-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2" <span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span> class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
...@@ -2584,15 +2588,15 @@ ...@@ -2584,15 +2588,15 @@
<span v-else-if="item2.colorState === 4" <span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span> class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
</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> </div>
<div @click=" <!--@click="(item.orderState==1||item.orderState==2)?goUrlSFD('SalesFinancialDetail', '销售财务单据', item):''"-->
goUrlSFD('SalesFinancialDetail', '销售财务单据', item) <div>
">
<div>付款单据:</div> <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-if="item2.colorState === 1" class="groupTourOrder_tickets_blue">{{ item2.frID }}</span>
<span v-else-if="item2.colorState === 2" <span v-else-if="item2.colorState === 2"
class="groupTourOrder_tickets_green">{{ item2.frID }}</span> class="groupTourOrder_tickets_green">{{ item2.frID }}</span>
...@@ -2601,7 +2605,8 @@ ...@@ -2601,7 +2605,8 @@
<span v-else-if="item2.colorState === 4" <span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span> class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
</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> </div>
<div> <div>
...@@ -2622,7 +2627,8 @@ ...@@ -2622,7 +2627,8 @@
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" <span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{ item2.id }}</span> @click="goIisDetail(item2.id)">{{ item2.id }}</span>
</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>
</div> </div>
</td> </td>
...@@ -3020,7 +3026,8 @@ ...@@ -3020,7 +3026,8 @@
</div> </div>
</td> </td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px"> <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>收款单据:</div>
<div> <div>
<span v-for="(item2, index2) in item.financeList" :key="index2+280000"> <span v-for="(item2, index2) in item.financeList" :key="index2+280000">
...@@ -3031,10 +3038,12 @@ ...@@ -3031,10 +3038,12 @@
<span v-else-if="item2.colorState === 4" <span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span> class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
</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> </div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <div
@click="(item.orderState==1||item.orderState==2)?goUrlSFD('SalesFinancialDetail', '销售财务单据', item):''">
<div>付款单据:</div> <div>付款单据:</div>
<div> <div>
<span v-for="(item2, index2) in item.refundFinanceList" :key="index2+290000"> <span v-for="(item2, index2) in item.refundFinanceList" :key="index2+290000">
...@@ -3045,7 +3054,8 @@ ...@@ -3045,7 +3054,8 @@
<span v-else-if="item2.colorState === 4" <span v-else-if="item2.colorState === 4"
class="groupTourOrder_tickets_black">{{ item2.frID }}</span> class="groupTourOrder_tickets_black">{{ item2.frID }}</span>
</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> </div>
<div> <div>
...@@ -3066,7 +3076,8 @@ ...@@ -3066,7 +3076,8 @@
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" <span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black"
@click="goIisDetail(item2.id)">{{ item2.id }}</span> @click="goIisDetail(item2.id)">{{ item2.id }}</span>
</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>
</div> </div>
</td> </td>
...@@ -3264,7 +3275,7 @@ ...@@ -3264,7 +3275,7 @@
export default { export default {
data() { data() {
return { return {
isShow:"", isShow: "",
timer: false, timer: false,
fullHeight: document.documentElement.clientHeight, fullHeight: document.documentElement.clientHeight,
ScreenHeight: 0, ScreenHeight: 0,
...@@ -3691,11 +3702,11 @@ ...@@ -3691,11 +3702,11 @@
}, },
}, },
methods: { methods: {
showMore(item,index){ showMore(item, index) {
if (this.isShow===index){ if (this.isShow === index) {
this.isShow='' this.isShow = ''
}else{ } else {
this.isShow= index; this.isShow = index;
} }
}, },
//跳转到保密协议 //跳转到保密协议
...@@ -4993,7 +5004,7 @@ ...@@ -4993,7 +5004,7 @@
this.addObj.ChildNoNeedPrice * this.addObj.ChildNoNeedPrice *
(Number(this.addMsg.ChirdNum) - (Number(this.addMsg.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum)); Number(this.addMsg.ChirdNeedBedNum));
let lianyun =0; let lianyun = 0;
// (Number(this.addMsg.ManNum) + // (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) + // Number(this.addMsg.ChirdNum) +
...@@ -5062,7 +5073,7 @@ ...@@ -5062,7 +5073,7 @@
this.addObj.ChildNoNeedPrice * this.addObj.ChildNoNeedPrice *
(Number(this.addMsg.ChirdNum) - (Number(this.addMsg.ChirdNum) -
Number(this.addMsg.ChirdNeedBedNum)); Number(this.addMsg.ChirdNeedBedNum));
let lianyun =0; let lianyun = 0;
// (Number(this.addMsg.ManNum) + // (Number(this.addMsg.ManNum) +
// Number(this.addMsg.ChirdNum) + // Number(this.addMsg.ChirdNum) +
// Number(this.addMsg.OldPeopleNum)) * // Number(this.addMsg.OldPeopleNum)) *
...@@ -6082,5 +6093,4 @@ ...@@ -6082,5 +6093,4 @@
this.canEditUnitPrice(); 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