Commit 04b5017c authored by zhengke's avatar zhengke

修改

parent 545dbe8e
...@@ -30,22 +30,15 @@ ...@@ -30,22 +30,15 @@
</el-table-column> </el-table-column>
<el-table-column prop="Number" label="数量" width="100"> <el-table-column prop="Number" label="数量" width="100">
</el-table-column> </el-table-column>
<el-table-column prop="OrderIntroduction" width="220" label="订单信息"> <el-table-column label="状态" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="OrderInformation"> <span style="color:red;" v-if="scope.row.OrderIntroduction.CommissionState==1">未结算</span>
<div>返佣id:{{scope.row.OrderIntroduction.IntroductionId}}</div>
<div>
状态:<span style="color:red;" v-if="scope.row.OrderIntroduction.CommissionState==1">未结算</span>
<span style="color:green;" v-if="scope.row.OrderIntroduction.CommissionState==2">已结算</span> <span style="color:green;" v-if="scope.row.OrderIntroduction.CommissionState==2">已结算</span>
</div> </template>
</div> </el-table-column>
<div class="OrderInformation"> <el-table-column label="佣金" width="100">
<div>姓名:{{scope.row.OrderIntroduction.Name}}</div> <template slot-scope="scope">
<div>佣金:{{scope.row.OrderIntroduction.Commission}}</div> {{scope.row.OrderIntroduction.Commission}}
</div>
<div class="OrderInformation">
<div style="width:100%;">昵称:{{scope.row.OrderIntroduction.UserName}}</div>
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<div class="content"> <div class="content">
<div> <div>
<el-form label-width="80px"> <el-form label-width="80px">
<el-form-item label="用户" style="display:inline-block;margin-bottom:0;"> <el-form-item label="用户" class="rr_BillItem">
<el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" <el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName"
@change="msg.pageIndex=1,getList()" filterable placeholder="请选择"> @change="msg.pageIndex=1,getList()" filterable placeholder="请选择">
<el-option label="不限" :value="0"></el-option> <el-option label="不限" :value="0"></el-option>
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="供应商" style="display:inline-block;margin-bottom:0;"> <el-form-item label="供应商" class="rr_BillItem">
<el-select class="w150" style="margin-right: 10px;" v-model="msg.SupplierId" <el-select class="w150" style="margin-right: 10px;" v-model="msg.SupplierId"
@change="msg.pageIndex=1,getList()" size="small" placeholder="请选择"> @change="msg.pageIndex=1,getList()" size="small" placeholder="请选择">
<el-option label="不限" :value="0"></el-option> <el-option label="不限" :value="0"></el-option>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="状态" style="display:inline-block;margin-bottom:0;"> <el-form-item label="状态" class="rr_BillItem">
<el-select class="w150" v-model="msg.BillState" size="small" @change="msg.pageIndex=1,getList()" <el-select class="w150" v-model="msg.BillState" size="small" @change="msg.pageIndex=1,getList()"
placeholder="请选择"> placeholder="请选择">
<el-option label="不限" :value="0"></el-option> <el-option label="不限" :value="0"></el-option>
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<el-option label="取消" :value="3"></el-option> <el-option label="取消" :value="3"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="期数" style="display:inline-block;margin-bottom:0;"> <el-form-item label="期数" class="rr_BillItem">
<el-input type="text" class="w150" size="small" @keyup.enter.native="msg.pageIndex=1,getList()" v-model="msg.Periods"> <el-input type="text" class="w150" size="small" @keyup.enter.native="msg.pageIndex=1,getList()" v-model="msg.Periods">
</el-input> </el-input>
</el-form-item> </el-form-item>
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"> <el-table-column type="selection" width="55">
</el-table-column> </el-table-column>
<el-table-column prop="OrderNo" label="订单号" width="120"></el-table-column> <el-table-column prop="OrderNo" label="订单号" width="190"></el-table-column>
<el-table-column prop="CoverImage" label="封面图" width="100"> <el-table-column prop="CoverImage" label="封面图" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<img :src="scope.row.CoverImage" style="width:50px;height:50px;" alt="" /> <img :src="scope.row.CoverImage" style="width:50px;height:50px;" alt="" />
...@@ -125,25 +125,19 @@ ...@@ -125,25 +125,19 @@
<div v-for="(item,index) in scope.row.SpecificationList" :key="index">{{item}}</div> <div v-for="(item,index) in scope.row.SpecificationList" :key="index">{{item}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ProductCode" label="货号" width="120"></el-table-column>
<el-table-column prop="Final_Price" label="最终价格" width="100"></el-table-column> <el-table-column prop="Final_Price" label="最终价格" width="100"></el-table-column>
<el-table-column prop="Number" label="数量" width="80"></el-table-column> <el-table-column prop="Number" label="数量" width="80"></el-table-column>
<el-table-column prop="OrderIntroduction" label="返佣信息" width="220"> <el-table-column prop="OrderIntroduction" label="返佣信息" width="220">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="OrderInformation">
<div>返佣id:{{scope.row.OrderIntroduction.IntroductionId}}</div>
<div>
状态:<span style="color:red;" v-if="scope.row.OrderIntroduction.CommissionState==1">未结算</span>
<span style="color:green;" v-if="scope.row.OrderIntroduction.CommissionState==2">已结算</span>
</div>
</div>
<div class="OrderInformation">
<div>姓名:{{scope.row.OrderIntroduction.Name}}</div> <div>姓名:{{scope.row.OrderIntroduction.Name}}</div>
<div>佣金:{{scope.row.OrderIntroduction.Commission}}</div>
</div>
<div class="OrderInformation">
<div>昵称:{{scope.row.OrderIntroduction.UserName}}</div> <div>昵称:{{scope.row.OrderIntroduction.UserName}}</div>
</div> <div>佣金:{{scope.row.OrderIntroduction.Commission}}</div>
</template>
</el-table-column>
<el-table-column label="状态" width="80">
<template slot-scope="scope">
<span style="color:red;" v-if="scope.row.OrderIntroduction.CommissionState==1">未结算</span>
<span style="color:green;" v-if="scope.row.OrderIntroduction.CommissionState==2">已结算</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
...@@ -412,5 +406,8 @@ ...@@ -412,5 +406,8 @@
.OrderInformation>div{ .OrderInformation>div{
width:50%; width:50%;
} }
.rr_BillItem{
display:inline-block;
margin-bottom: 0;
}
</style> </style>
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