Commit cfba1324 authored by 罗超's avatar 罗超

no message

parent 1b3f93c2
......@@ -45,7 +45,7 @@
<template>
<div class="Business">
<div class="add-Enclosure">
<el-row :gutter="14">
<el-row :gutter="16">
<el-col :span="8">
<el-input size="mini" placeholder="输入订单ID" v-model="msg.OrderId" label="订单ID"
@keyup.enter.native="getList"></el-input>
......@@ -61,7 +61,7 @@
</el-select>
</div>
</el-col>
<el-col :span="4">
<el-col :span="6">
<el-select size="mini" width="200" v-model="msg.OrderStatus" placeholder="请选择"
@change="getList">
<el-option
......@@ -119,21 +119,21 @@
label="实收"
width="120">
<template slot-scope="scope">
{{scope.row.IncomeMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,1)" class="iconfont iconjia- numIcon"></i>
{{scope.row.IncomeMoney}}<i v-if="scope.row.OrderStatus==1" @click="makeAdocument(scope.row,1)" class="iconfont iconjia- numIcon"></i>
</template>
</el-table-column>
<el-table-column
label="退款"
width="120">
<template slot-scope="scope">
{{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i>
{{scope.row.BackMoney}}<i v-if="scope.row.OrderStatus==1" @click="makeAdocument(scope.row,2)" class="iconfont iconjia- numIcon"></i>
</template>
</el-table-column>
<el-table-column
label="成本"
width="120">
<template slot-scope="scope">
{{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus!=1" @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
{{scope.row.PayMoney}}<i v-if="scope.row.OrderStatus==1" @click="makeAdocument(scope.row,3)" class="iconfont iconjia- numIcon"></i>
</template>
</el-table-column>
<el-table-column
......@@ -221,7 +221,7 @@
<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&&!scope.row.BackFinance&&!scope.row.PayFinance"
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>
......@@ -229,6 +229,16 @@
class="item-but" effect="dark" content="操作日志" placement="top">
<i class="iconfont iconcopy cp" @click="operationLog(scope.row)"></i>
</el-tooltip>
<!-- <el-tooltip effect="dark" placement="top-start" disabled style="float:left">
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="operationLog(scope.row)">
操作日志
</div>
</div>
<span slot="reference">更多</span>
</el-popover>
</el-tooltip> -->
</div>
</template>
......
......@@ -45,7 +45,7 @@
<template>
<div class="Business">
<div class="add-Enclosure">
<el-row :gutter="14">
<el-row :gutter="16">
<el-col :span="8">
<el-input size="mini" placeholder="输入单号" v-model="msg.FrID" label="单号"
@keyup.enter.native="getList"></el-input>
......@@ -93,42 +93,23 @@
</el-table-column>
<el-table-column
label="单据类型"
show-overflow-tooltip :width="80">
show-overflow-tooltip>
<template slot-scope="scope">
<p>{{scope.row.Type==1?'收入':(scope.row.Type==2?'支出':'不限')}}</p>
</template>
</el-table-column>
<el-table-column
fixed
label="费用类型"
show-overflow-tooltip :width="120">
show-overflow-tooltip>
<template slot-scope="scope">
<p v-for="(item,index) in scope.row.CostTypeList" :key="index">
{{item}}
</p>
</template>
</el-table-column>
<el-table-column
label="金额"
show-overflow-tooltip
width="120">
<template slot-scope="scope">
<p>{{scope.row.Type==1?'应收:':(scope.row.Type==2?'应付:':'')}}{{scope.row.Money}}</p>
<p>{{scope.row.Type==1?'实收:':(scope.row.Type==2?'实付:':'')}}{{scope.row.PayMoney}}</p>
</template>
</el-table-column>
<el-table-column
label="付款对象"
show-overflow-tooltip
width="120">
<template slot-scope="scope">
{{scope.row.Type==2?scope.row.ClientTypeName+':':'汇款人:'}}{{scope.row.RemitterName}}
</template>
</el-table-column>
<el-table-column
label="交易方式"
show-overflow-tooltip :width="200">
show-overflow-tooltip width="200">
<template slot-scope="scope">
<div class="_TradeWayList"
v-for="(item,index) in scope.row.TradeWayList"
......@@ -140,9 +121,23 @@
</div>
</template>
</el-table-column>
<el-table-column
label="金额" width="150">
<template slot-scope="scope">
<p>{{scope.row.Type==1?'应收:':(scope.row.Type==2?'应付:':'')}}{{scope.row.Money}}</p>
<p>{{scope.row.Type==1?'实收:':(scope.row.Type==2?'实付:':'')}}{{scope.row.PayMoney}}</p>
</template>
</el-table-column>
<el-table-column
label="付款对象"
show-overflow-tooltip width="260">
<template slot-scope="scope">
{{scope.row.Type==2?scope.row.ClientTypeName+':':'汇款人:'}}{{scope.row.RemitterName}}
</template>
</el-table-column>
<el-table-column
label="制单人员"
show-overflow-tooltip :width="80">
show-overflow-tooltip>
<template slot-scope="scope">
{{scope.row.EmName}}
</template>
......@@ -150,7 +145,7 @@
<el-table-column
fixed="right"
label="当前状态"
show-overflow-tooltip :width="80">
show-overflow-tooltip width="110">
<template slot-scope="scope">
{{scope.row.StatusStr}}
</template>
......
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