Commit 2d559b9d authored by liudong1993's avatar liudong1993

1

parent b88e2eb4
...@@ -744,7 +744,7 @@ ...@@ -744,7 +744,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
flex-wrap: wrap; flex-wrap: wrap;
margin: 5px 0; margin: 2px 0;
} }
.documents-left span{ .documents-left span{
margin-right: 10px; margin-right: 10px;
......
...@@ -220,29 +220,16 @@ ...@@ -220,29 +220,16 @@
<el-table-column <el-table-column
fixed="right" fixed="right"
label="操作" label="操作"
width="200"> width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="item-but-box"> <div class="item-but-box">
<!-- <el-tooltip
class="item-but" effect="dark" content="编辑订单" placement="top">
<i class="iconfont iconwenbenbianji cp" @click="editOrder(scope.row)"></i>
</el-tooltip>
<el-tooltip
v-if="scope.row.TicketStatus==1&&scope.row.OrderStatus==1&&scope.row.IncomeFinance.length==0&&!scope.row.BackFinance.length==0&&!scope.row.PayFinance.length==0"
class="item-but" effect="dark" content="取消订单" placement="top">
<i class="iconfont iconquxiao cp" @click="cancelOrder(scope.row)"></i>
</el-tooltip>
<el-tooltip
class="item-but" effect="dark" content="操作日志" placement="top">
<i class="iconfont iconcopy cp" @click="operationLog(scope.row)"></i>
</el-tooltip> -->
<div class="enedit-box"> <div class="enedit-box">
<el-tooltip <el-tooltip
class="item-but" effect="dark" content="编辑订单" placement="top"> class="item-but" effect="dark" content="编辑订单" placement="top">
<i class="iconfont iconwenbenbianji cp" @click="editOrder(scope.row)"></i> <i class="iconfont iconwenbenbianji cp" @click="editOrder(scope.row)"></i>
</el-tooltip> </el-tooltip>
<div> <div>
<el-select style="width:130px" class="select-right" <el-select style="width:70px" class="select-right"
clearable clearable
size="mini" size="mini"
v-model="scope.row.More" placeholder="更多" v-model="scope.row.More" placeholder="更多"
...@@ -277,10 +264,8 @@ export default { ...@@ -277,10 +264,8 @@ export default {
data() { data() {
return { return {
MoreList:[ MoreList:[
{Name:'编辑订单金额',Id:'5'},
{Name:'取消订单',Id:'1'}, {Name:'取消订单',Id:'1'},
{Name:'订单转交',Id:'2'}, {Name:'订单转交',Id:'2'},
{Name:'修改出票状态',Id:'4'},
{Name:'操作日志',Id:'3'}, {Name:'操作日志',Id:'3'},
], ],
orderStatusList:[ orderStatusList:[
...@@ -380,7 +365,7 @@ export default { ...@@ -380,7 +365,7 @@ export default {
if(this.isOnline()){ if(this.isOnline()){
url = 'http://yx.oytour.com/#/' url = 'http://yx.oytour.com/#/'
}else{ }else{
url = 'http://www.test.com:8080/#/' url = 'http://www.test.com:8084/#/'
} }
let data = [ let data = [
{ {
......
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