Commit 8f75ae78 authored by zhengke's avatar zhengke

no message

parent d5ff468c
...@@ -51,10 +51,12 @@ ...@@ -51,10 +51,12 @@
.income_1 { .income_1 {
color: #2961FE; color: #2961FE;
cursor: pointer;
} }
.income_2 { .income_2 {
color: #3FC4FF; color: #3FC4FF;
cursor: pointer;
} }
.enedit-box { .enedit-box {
...@@ -107,6 +109,9 @@ ...@@ -107,6 +109,9 @@
border-bottom: 3px solid #fff; border-bottom: 3px solid #fff;
left:-8px; left:-8px;
} }
/deep/.el-table .cell.el-tooltip{
overflow: hidden !important;
}
</style> </style>
<template> <template>
<div class="Business"> <div class="Business">
...@@ -244,7 +249,10 @@ ...@@ -244,7 +249,10 @@
(scope.row.TicketStatus==4?'Black':'')))"> (scope.row.TicketStatus==4?'Black':'')))">
{{scope.row.TicketStatusName}} {{scope.row.TicketStatusName}}
</span> </span>
<i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(scope.row)"></i> <i v-if="scope.row.TicketStatus!=1&&
scope.row.TicketVoucherList!=[]&&
scope.row.CancelVoucherList!=[]&&
scope.row.TicketStatusName!='无需机票'" class="iconfont iconpingzhengchaxun Credentials" @click="viewCredentials(scope.row)"></i>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="订单状态" show-overflow-tooltip> <el-table-column label="订单状态" show-overflow-tooltip>
...@@ -426,8 +434,13 @@ ...@@ -426,8 +434,13 @@
} }
this.makeAdocumentFun(row, index, num) this.makeAdocumentFun(row, index, num)
if(num==1){ if(num==1){
if(this.dataList[index].checkList.length==1){
}else{
this.dataList[index].actuallyReceived =false this.dataList[index].actuallyReceived =false
} }
}
if(num==3){ if(num==3){
this.dataList[index].cost =false this.dataList[index].cost =false
} }
...@@ -519,7 +532,7 @@ ...@@ -519,7 +532,7 @@
makeAdocument(row, index, num) { makeAdocument(row, index, num) {
this.dataList[index].MultipleChoiceList=[] this.dataList[index].MultipleChoiceList=[]
let list = row.OrderType&&row.OrderType.split(',') let list = row.OrderType&&row.OrderType.split(',')
if(list!=null&&list.length!=0&&num==1){ if(list!=null&&list.length>1&&num==1){
this.dataList.forEach(item=>{ this.dataList.forEach(item=>{
return item.cost = false return item.cost = false
}) })
...@@ -536,7 +549,7 @@ ...@@ -536,7 +549,7 @@
} }
} }
else if(list!=null&&list.length!=0&&num==3){ else if(list!=null&&list.length>1&&num==3){
this.dataList.forEach(item=>{ this.dataList.forEach(item=>{
return item.actuallyReceived = false return item.actuallyReceived = false
}) })
...@@ -562,13 +575,14 @@ ...@@ -562,13 +575,14 @@
} else { } else {
if (row.OrderStatus != '2') { if (row.OrderStatus != '2') {
if(list&&list.length>1){ if(list&&list.length>1){
if(num=='1'){ let typeList = row.selectedType.split(',')
if(num=='1'&&typeList.length>=2){
let type let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本anceId2 = num type = num == 1 ? 1 : 2 // 1收款 2退款 3成本anceId2 = num
let $this = this; let $this = this;
row.ReFinanceId2 = num row.ReFinanceId2 = num
this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true); this.MsgBus.$emit("BillMakingOrderBoxOpen", $this.ID, row, true);
}if(num=='3'){ }if(typeList.length==1&&num=='1'||num=='3'){
let type let type
type = num == 1 ? 1 : 2 // 1收款 2退款 3成本 type = num == 1 ? 1 : 2 // 1收款 2退款 3成本
let href let href
...@@ -589,10 +603,10 @@ ...@@ -589,10 +603,10 @@
}] }]
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data) href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href); window.open(href);
for(let i=0;i<$this.dataList.length;i++){ for(let i=0;i<this.dataList.length;i++){
$this.dataList[i].checkList = [] this.dataList[i].checkList = []
$this.dataList[i].MultipleChoiceList = [] this.dataList[i].MultipleChoiceList = []
$this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
} }
} }
...@@ -630,10 +644,10 @@ ...@@ -630,10 +644,10 @@
} }
href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data) href = url + 'automaticLogin?token=' + this.getLocalStorage().token + '&data=' + JSON.stringify(data)
window.open(href); window.open(href);
for(let i=0;i<$this.dataList.length;i++){ for(let i=0;i<this.dataList.length;i++){
$this.dataList[i].checkList = [] this.dataList[i].checkList = []
$this.dataList[i].MultipleChoiceList = [] this.dataList[i].MultipleChoiceList = []
$this.dataList[i].selectedType = "" this.dataList[i].selectedType = ""
} }
} }
...@@ -641,6 +655,7 @@ ...@@ -641,6 +655,7 @@
} }
}, },
// 操作日志 // 操作日志
operationLog(row) { operationLog(row) {
let $this = this; let $this = this;
......
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