Skip to content

S
SuperMan
Commit 0ca1402b authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parent c10807a5
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 36 deletions
src/components/SalesModule/BulkAirTicketOrders.vue
View file @ 0ca1402b
......@@ -83,7 +83,7 @@
<span v-if="item.RefundStatus==2">退款中</span>
<span v-if="item.RefundStatus==3">已退款</span>
</p>
<p else>
<p v-else>
<span v-if="item.Status==1">正常</span>
<span v-if="item.Status==2">取消</span>
<span v-if="item.Status==3">待付款</span>
......@@ -92,7 +92,7 @@
</td>
<td>
<p v-if="item.RefundStatus==1 && item.Status==1 && item.RefundFinanceList.length==0">
<p v-if="item.RefundStatus==2 && item.Status==1 && item.RefundFinanceList.length==0">
<el-tooltip class="item" effect="dark" content="退款" placement="top-end">
<el-button @click="RefundPay(item)" type="danger" icon="el-icon-star-off" circle></el-button>
</el-tooltip>
......@@ -160,9 +160,12 @@
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-if="fina.ColorState===1" class="groupTourOrder_tickets_blue">{{fina.frID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===2" class="groupTourOrder_tickets_green">{{fina.frID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===3" class="groupTourOrder_tickets_red">{{fina.frID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===4" class="groupTourOrder_tickets_black">{{fina.frID}}</span>
</span>
<span v-if="item.FinanceList==0">
<span v-if="item.FinanceList.length==0">
暂无数据
</span>
</span>
......@@ -174,9 +177,13 @@
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-if="fina.ColorState===1" class="groupTourOrder_tickets_blue">{{fina.frID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===2" class="groupTourOrder_tickets_green">{{fina.frID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===3" class="groupTourOrder_tickets_red">{{fina.frID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===4" class="groupTourOrder_tickets_black">{{fina.frID}}</span>
<!-- <span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span> -->
</span>
<span v-if="item.RefundFinanceList==0">
<span v-if="item.RefundFinanceList.length==0">
暂无数据
</span>
</span>
......
src/components/Ticketing/IndividualTicketOrder.vue
View file @ 0ca1402b
......@@ -94,12 +94,16 @@
<tbody v-for="(item,index) in dataList" :key="index">
<tr>
<td>{{item.Id}} </td>
<td>{{item.Id}} </td><!-- 机票编码 -->
<td>
<span @click="goUrl('散客机票','individualTicket',item.AirTicketId)" class="guest_num">{{item.AirTicketId}}</span>
</td><!-- 机票编码 -->
<td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
<!-- <p class="fz12">123456</p> -->
</td>
<td>{{item.GuestNum}}/{{item.SeatNum}}/{{item.FreightSpace}}</td>
<td>
<span class="guest_num">{{item.GuestNum}}/{{item.SeatNum}}/{{item.FreightSpace}}</span>
</td>
<td class="fz12">{{item.TC_Price}}</td>
<td class="fz12">{{item.Unit_Price}}</td>
<td style="color:#E95252">{{item.PreferPrice}}</td>
......@@ -170,26 +174,33 @@
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div>
<div>收款单据：</div>
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</span>
<span v-if="item.FinanceList==0">
<div style="cursor: pointer;">
<span v-for="(item2,index2) in item.FinanceList" :key="index2">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===2" class="groupTourOrder_tickets_green">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===3" class="groupTourOrder_tickets_red">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" 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">
暂无数据
</span>
</span>
</div>
</div>
<div>
<div>付款单据：</div>
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
<span style="cursor: pointer;">
<span v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-if="fina.ColorState===1" class="groupTourOrder_tickets_blue">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===2" class="groupTourOrder_tickets_green">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===3" class="groupTourOrder_tickets_red">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===4" class="groupTourOrder_tickets_black">{{fina.FrID}}</span>
<!-- <span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span> -->
</span>
<span v-if="item.RefundFinanceList==0">
<span v-if="item.RefundFinanceList.length==0">
暂无数据
</span>
</span>
......@@ -279,7 +290,7 @@ export default {
res => {
this.loading=false;
if (res.data.resultCode == 1) {
// console.log(res);
console.log(res);
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
} else {
......@@ -304,6 +315,14 @@ export default {
</script>
<style scoped>
@import "../../assets/css/newTravelManager.css";
.guest_num:hover{
font-weight: bold;
}
.guest_num{
text-decoration: underline;
cursor: pointer;
color: rgb(26, 168, 107);
}
.tickets_green {
color: #008000;
text-decoration: underline;
......
src/components/Ticketing/IndividualTicketOrderDetails.vue
View file @ 0ca1402b
......@@ -113,11 +113,15 @@
<div>
<div>收款单据：</div>
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</span>
<span v-if="item.FinanceList==0">
<span style="cursor: pointer;">
<span v-for="(item2,index2) in item.FinanceList" :key="index2">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-if="item2.ColorState===1" class="groupTourOrder_tickets_blue">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===2" class="groupTourOrder_tickets_green">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" v-else-if="item2.ColorState===3" class="groupTourOrder_tickets_red">{{item2.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',item2.FrID)" 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">
暂无数据
</span>
</span>
......@@ -127,14 +131,18 @@
<div>
<div>付款单据：</div>
<div>
<span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span>
</span>
<span v-if="item.RefundFinanceList==0">
暂无数据
</span>
</span>
<span style="cursor: pointer;">
<span v-for="(fina,fin) in item.RefundFinanceList" :key="fin">
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-if="fina.ColorState===1" class="groupTourOrder_tickets_blue">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===2" class="groupTourOrder_tickets_green">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===3" class="groupTourOrder_tickets_red">{{fina.FrID}}</span>
<span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)" v-else-if="fina.ColorState===4" class="groupTourOrder_tickets_black">{{fina.FrID}}</span>
<!-- <span @click="goUrl('财务单据','FinancialDocumentsDetail',fina.FrID)">{{fina.FrID}}</span> -->
</span>
<span v-if="item.RefundFinanceList.length==0">
暂无数据
</span>
</span>
</div>
</div>
</td>
......
src/components/Ticketing/individualTicket.vue
View file @ 0ca1402b
......@@ -286,6 +286,7 @@
<span>
<em>状态</em>
<el-select v-model="msg.FlyState" :placeholder="$t('system.ph_in')">
<el-option label="不限" :value='-1'></el-option>
<el-option label="未起飞" :value='0'></el-option>
<el-option label="已起飞" :value='1'></el-option>
</el-select>
......@@ -493,6 +494,7 @@
</div>
</template>
<script>
import moment from 'moment'
export default {
data() {
return {
......@@ -500,14 +502,14 @@
pageIndex: 1,
pageSize: 6,
ID: 0,
QFlightDateStart:'',
QFlightDateStart:moment().format("YYYY-MM-DD"),
QFlightDateEnd: "",
Flight_number:'',
AirLineID: 0,
TicketType: 2, //定金类型(1定，2定等)
LineId: 0, //线路编号
IsPayOrder:0,
FlyState: 0,
FlyState: -1,
CreateBy: 0, //操作人
},
//员工列表
......@@ -544,6 +546,11 @@
},
};
},
created(){
if(this.$route.query.id){
this.msg.Flight_number=this.$route.query.id;
}
},
methods: {
goUrl(path, item) {
// console.log(item);
......
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