Commit 10035d73 authored by youjie's avatar youjie

no message

parent 3568d946
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<el-input type="Number" v-model="msg.orderId" :placeholder="$t('OrderList.search.orderId')" class="w200"/> <el-input type="Number" v-model="msg.orderId" :placeholder="$t('OrderList.search.orderId')" class="w200"/>
</span> </span>
</li> --> </li> -->
<!-- <li> <!-- <li>
<span> <span>
<em>{{$t('OrderList.search.orderType')}}</em> <em>{{$t('OrderList.search.orderType')}}</em>
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
}, },
watch: { watch: {
pagesTitle(val,oldval){ pagesTitle(val,oldval){
} }
}, },
methods: { methods: {
...@@ -337,7 +337,8 @@ ...@@ -337,7 +337,8 @@
PlatformMoney:item.PlatformMoney, PlatformMoney:item.PlatformMoney,
HandFittingIncome: item.HandFittingIncome, HandFittingIncome: item.HandFittingIncome,
HandFittingTax: item.HandFittingTax, HandFittingTax: item.HandFittingTax,
DueInMoney:item.DueInMoney DueInMoney:item.DueInMoney,
...item
} }
item.list.push(datas) item.list.push(datas)
}) })
......
...@@ -562,7 +562,8 @@ ...@@ -562,7 +562,8 @@
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span> <span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?(scope.row.Income-scope.row.CostMoney-scope.row.Refund).toFixed(2):'-' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)" label="提成" style="background:#EAEAEA"> <el-table-column v-if="(scope.row.SellCommission&&scope.row.SellCommission>0)||(scope.row.OPCommission&&scope.row.OPCommission>0)"
label="提成" style="background:#EAEAEA">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="width100-float-l" v-if="scope.row.SellCommission&&scope.row.SellCommission>0"><span class="float-l">销售:</span> <div class="width100-float-l" v-if="scope.row.SellCommission&&scope.row.SellCommission>0"><span class="float-l">销售:</span>
<commissionDialog :objNew="scope.row" :OP="0"></commissionDialog> <commissionDialog :objNew="scope.row" :OP="0"></commissionDialog>
......
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