Skip to content

S
SuperMan
Commit 27992f42 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

'新增在途字段@@'

parent 1ec826b1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 58 deletions
src/components/SalesModule/enrollTotal.vue
View file @ 27992f42
...@@ -159,12 +159,13 @@ ...@@ -159,12 +159,13 @@
<th width="80">实收</th> <th width="80">实收</th>
<th width="80">退款</th> <th width="80">退款</th>
<th width="80">平台税金</th> <th width="80">平台税金</th>
<th width="80">平台在途</th>
<th width="80">待收金额</th> <th width="80">待收金额</th>
<th width="60">状态</th> <th width="60">状态</th>
<th v-if="userId==1" width="140">操作</th> <th v-if="userId==1" width="140">操作</th>
</tr> </tr>
<tr> <tr>
<td v-show="list.length==0" colspan="13" align="center">暂无数据</td> <td v-show="list.length==0" colspan="15" align="center">暂无数据</td>
</tr> </tr>
<tbody v-for="(item,index) in list" :key="index"> <tbody v-for="(item,index) in list" :key="index">
<tr> <tr>
...@@ -203,6 +204,7 @@ ...@@ -203,6 +204,7 @@
</td> </td>
<td>{{item.refund}}</td> <td>{{item.refund}}</td>
<td>{{item.platformTax}}</td> <td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td> <td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td> <td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="userId==1"> <td v-if="userId==1">
...@@ -240,15 +242,15 @@ ...@@ -240,15 +242,15 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;"> <td colspan="7" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div> <div>
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
<span v-for="(item2,index2) in item.financeList" :key="index2"> <span v-for="(item2,index2) in item.financeList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span> <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{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" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{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" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span> <span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span> </span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span> <span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
</div> </div>
...@@ -257,10 +259,10 @@ ...@@ -257,10 +259,10 @@
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2"> <span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span> <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{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" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{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" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span> <span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span> </span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span> <span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
</div> </div>
...@@ -377,6 +379,22 @@ ...@@ -377,6 +379,22 @@
}; };
}, },
methods: { methods: {
goUrlSFD: function (path, name, item) {
let obj = JSON.parse(JSON.stringify(item))
obj.oP_Remarks = ''
obj.remarksList = []
obj.refundFinanceList = []
obj.remarks = []
obj.ltName = []
obj.lineName = []
obj.financeList = []
obj.guestList = []
obj.description = []
this.$router.push({
name: path,
query: { blank: 'y', tab: name, item: JSON.stringify(obj)}
});
},
// 结束日期不能大于开始日期 // 结束日期不能大于开始日期
dataDui() { dataDui() {
if (this.msg.CStartDate > this.msg.CEndDate && this.msg.CEndDate !== "") { if (this.msg.CStartDate > this.msg.CEndDate && this.msg.CEndDate !== "") {
......
src/components/SalesModule/groupTourOrder.vue
View file @ 27992f42
...@@ -1129,6 +1129,7 @@ ...@@ -1129,6 +1129,7 @@
<span>应收款：{{countData.PreferPrice}};</span> <span>应收款：{{countData.PreferPrice}};</span>
<span>已收款：{{countData.Income}};</span> <span>已收款：{{countData.Income}};</span>
<span :class="{color_red_order:countData.DueinMoney!==countData.PreferPrice}">未收款：{{countData.DueinMoney}};</span> <span :class="{color_red_order:countData.DueinMoney!==countData.PreferPrice}">未收款：{{countData.DueinMoney}};</span>
<span>在途金额：{{countData.ZaiTu}};</span>
</p> </p>
</div> </div>
</el-col> </el-col>
...@@ -1203,13 +1204,14 @@ ...@@ -1203,13 +1204,14 @@
<th width="80">实收</th> <th width="80">实收</th>
<th width="80">退款</th> <th width="80">退款</th>
<th width="80">平台税金</th> <th width="80">平台税金</th>
<th width="80">平台在途</th>
<th width="80">待收金额</th> <th width="80">待收金额</th>
<th width="80">状态</th> <th width="80">状态</th>
<th width="120">确认函</th> <th width="120">确认函</th>
<th width="200">操作</th> <th width="200">操作</th>
</tr> </tr>
<tr> <tr>
<td v-show="list.length==0" colspan="15" align="center">暂无数据</td> <td v-show="list.length==0" colspan="16" align="center">暂无数据</td>
</tr> </tr>
<tbody v-for="(item,index) in list" :key="index"> <tbody v-for="(item,index) in list" :key="index">
<tr> <tr>
...@@ -1300,6 +1302,7 @@ ...@@ -1300,6 +1302,7 @@
</td> </td>
<td>{{item.refund}}</td> <td>{{item.refund}}</td>
<td>{{item.platformTax}}</td> <td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td> <td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td> <td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td width="120"> <td width="120">
...@@ -1359,7 +1362,7 @@ ...@@ -1359,7 +1362,7 @@
</td> </td>
</tr> </tr>
<tr style="height:20px"> <tr style="height:20px">
<td colspan="16" class="RL_Order" style="height:20px"> <td colspan="15" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">名单:</span> <span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span> <span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
...@@ -1389,7 +1392,7 @@ ...@@ -1389,7 +1392,7 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div> <div>
<span>OP备注:</span> <span>OP备注:</span>
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 27992f42
...@@ -1387,6 +1387,7 @@ ...@@ -1387,6 +1387,7 @@
<th width="80">实收</th> <th width="80">实收</th>
<th width="80">退款</th> <th width="80">退款</th>
<th width="80">平台税金</th> <th width="80">平台税金</th>
<th width="80">平台在途</th>
<th width="80">待收金额</th> <th width="80">待收金额</th>
<th width="60">状态</th> <th width="60">状态</th>
<th width="80">候补</th> <th width="80">候补</th>
...@@ -1399,7 +1400,7 @@ ...@@ -1399,7 +1400,7 @@
<template v-for="op in list"> <template v-for="op in list">
<tbody class="not_border"> <tbody class="not_border">
<tr> <tr>
<td colspan="14">类型：<span style="color: #e95252;">{{op.groupName}}</span></td> <td colspan="15">类型：<span style="color: #e95252;">{{op.groupName}}</span></td>
</tr> </tr>
</tbody> </tbody>
<tbody v-for="(item,index) in op.list" :key="index"> <tbody v-for="(item,index) in op.list" :key="index">
...@@ -1505,6 +1506,10 @@ ...@@ -1505,6 +1506,10 @@
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.platformTax}}</span> <span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.platformTax}}</span>
<span v-else>******</span> <span v-else>******</span>
</td> </td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.zaiTuMoney}}</span>
<span v-else>******</span>
</td>
<td> <td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder" :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span> <span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder" :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span>
<span v-else>******</span> <span v-else>******</span>
...@@ -1602,7 +1607,7 @@ ...@@ -1602,7 +1607,7 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div> <div>
<span>OP备注:</span> <span>OP备注:</span>
...@@ -1829,7 +1834,7 @@ ...@@ -1829,7 +1834,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="8" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="7" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div> <div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div> <div>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 27992f42
...@@ -84,15 +84,15 @@ ...@@ -84,15 +84,15 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="5" class="groupTourOrder_count_col"> <el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div> <div>
<i class="iconfont icon-baomingrenshu groupTourOrder_count_green"></i> <i class="iconfont icon-qian groupTourOrder_count_green"></i>
<span>总报名人数</span> <span>销售额统计</span>
<span>{{countData.TotalGuestNum}}</span>
</div> </div>
<p> <p>
<span>经济舱：{{countData.TotalYSeatNum}};</span> <span>应收款：{{countData.PreferPrice}};</span>
<span>商务舱：{{countData.TotalESeatNum}};</span> <span>已收款：{{countData.Income}};</span>
<span>头等舱：{{countData.TotalFSeatNum}};</span> <span :class="{color_red_order:countData.DueinMoney!==countData.PreferPrice}">未收款：{{countData.DueinMoney}};</span>
<span>在途金额：{{countData.ZaiTu}};</span>
</p> </p>
</div> </div>
</el-col> </el-col>
...@@ -184,12 +184,13 @@ ...@@ -184,12 +184,13 @@
<th width="80">实收</th> <th width="80">实收</th>
<th width="80">退款</th> <th width="80">退款</th>
<th width="80">平台税金</th> <th width="80">平台税金</th>
<th width="80">平台在途</th>
<th width="60">状态</th> <th width="60">状态</th>
<th width="60">客户信息</th> <th width="60">客户信息</th>
<th v-if="userId==1" width="130">操作</th> <th v-if="userId==1" width="130">操作</th>
</tr> </tr>
<tr> <tr>
<td v-show="OrderList.length==0" colspan="12" align="center">暂无数据</td> <td v-show="OrderList.length==0" colspan="14" align="center">暂无数据</td>
</tr> </tr>
<tbody v-for="(item,index) in OrderList" :key="index"> <tbody v-for="(item,index) in OrderList" :key="index">
<tr> <tr>
...@@ -241,6 +242,7 @@ ...@@ -241,6 +242,7 @@
</td> </td>
<td>{{item.refund}}</td> <td>{{item.refund}}</td>
<td>{{item.platformTax}}</td> <td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td> <td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td> <td>
<p <p
...@@ -293,33 +295,33 @@ ...@@ -293,33 +295,33 @@
</div> </div>
</div> </div>
</td> </td>
<td colspan="6" class="groupTourOrder_tickets" style="height: 20px;"> <td colspan="6" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div> <div>
<div style="white-space: nowrap">收款单据：<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span> <div style="white-space: nowrap">收款单据：<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
<span v-for="(item2,index2) in item.financeList" :key="index2"> <span v-for="(item2,index2) in item.financeList" :key="index2">
<span <span
v-if="item2.colorState===1" v-if="item2.colorState===1"
class="groupTourOrder_tickets_blue" class="groupTourOrder_tickets_blue"
@click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"
> 《{{item2.frID}}》 > 《{{item2.frID}}》
</span> </span>
<span <span
v-else-if="item2.colorState===2" v-else-if="item2.colorState===2"
class="groupTourOrder_tickets_green" class="groupTourOrder_tickets_green"
@click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"
> 《{{item2.frID}}》</span> > 《{{item2.frID}}》</span>
<span <span
v-else-if="item2.colorState===3" v-else-if="item2.colorState===3"
class="groupTourOrder_tickets_red" class="groupTourOrder_tickets_red"
@click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"
>《{{item2.frID}}》 >《{{item2.frID}}》
</span> </span>
<span <span
v-else-if="item2.colorState===4" v-else-if="item2.colorState===4"
class="groupTourOrder_tickets_black" class="groupTourOrder_tickets_black"
@click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"
>《{{item2.frID}}》 >《{{item2.frID}}》
</span> </span>
</span> </span>
...@@ -331,22 +333,22 @@ ...@@ -331,22 +333,22 @@
<span <span
v-if="item2.colorState===1" v-if="item2.colorState===1"
class="groupTourOrder_tickets_blue" class="groupTourOrder_tickets_blue"
@click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"
>《{{item2.frID}}》</span> >《{{item2.frID}}》</span>
<span <span
v-else-if="item2.colorState===2" v-else-if="item2.colorState===2"
class="groupTourOrder_tickets_green" class="groupTourOrder_tickets_green"
@click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"
>《{{item2.frID}}》</span> >《{{item2.frID}}》</span>
<span <span
v-else-if="item2.colorState===3" v-else-if="item2.colorState===3"
class="groupTourOrder_tickets_red" class="groupTourOrder_tickets_red"
@click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"
>《{{item2.frID}}》</span> >《{{item2.frID}}》</span>
<span <span
v-else-if="item2.colorState===4" v-else-if="item2.colorState===4"
class="groupTourOrder_tickets_black" class="groupTourOrder_tickets_black"
@click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')"
>《{{item2.frID}}》</span> >《{{item2.frID}}》</span>
</span> </span>
</div> </div>
...@@ -457,6 +459,22 @@ export default { ...@@ -457,6 +459,22 @@ export default {
}; };
}, },
methods: { methods: {
goUrlSFD: function (path, name, item) {
let obj = JSON.parse(JSON.stringify(item))
obj.oP_Remarks = ''
obj.remarksList = []
obj.refundFinanceList = []
obj.remarks = []
obj.ltName = []
obj.lineName = []
obj.financeList = []
obj.guestList = []
obj.description = []
this.$router.push({
name: path,
query: { blank: 'y', tab: name, item: JSON.stringify(obj)}
});
},
getCompanyList() { getCompanyList() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
let RB_Group_id = userInfo.RB_Group_id; let RB_Group_id = userInfo.RB_Group_id;
...@@ -688,7 +706,7 @@ export default { ...@@ -688,7 +706,7 @@ export default {
} }
.enrollTotalSearchTable tr { .enrollTotalSearchTable tr {
border-bottom: 2px solid #333; /* border-bottom: 2px solid #333; */
} }
.enrollTotalSearchTable tr th { .enrollTotalSearchTable tr th {
......
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